From e87baead65c5307710120847009ec09858b16768 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 16:06:30 -0500
Subject: [PATCH 001/118] test

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 849070d2fe5d..23a735c20f73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ FROM debian:buster-slim
 
 # Install binary dependencies
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y curl file gcc g++ hwloc libhwloc-dev make openssh-client \
+    apt-get install --no-install-recommends -y curl file gcc g++ hwloc libhwloc-dev \
     autoconf automake cmake libtool libcurl4 libcurl4-openssl-dev libssl-dev \
     libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
     xz-utils pkg-config python clang ocl-icd-opencl-dev ca-certificates

From 8ca169514ed68b3f8bac9238ba8e7b2b7a03b3f0 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 17:05:02 -0500
Subject: [PATCH 002/118] test-pubs

---
 .circleci/config.yml       | 14 ++++++++++++++
 scripts/build-rust-docs.sh |  9 +++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 scripts/build-rust-docs.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f1d2bea5322..a56dcace6715 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -149,6 +149,20 @@ jobs:
       - run:
           name: Build Unit Tests
           command: make install
+  publish-docs:
+    executor: test-executor
+    description: Publish documentation to GitHub pages
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Build Docs
+          command: cargo doc --no-deps --all-features
+      - run:
+          name: Publish Docs
+          command: scripts/build-rust-docs.sh
+      - persist_to_workspace:
+          root: target/doc
 
 workflows:
   setup_test:
diff --git a/scripts/build-rust-docs.sh b/scripts/build-rust-docs.sh
new file mode 100644
index 000000000000..08c824233b8b
--- /dev/null
+++ b/scripts/build-rust-docs.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd target/doc
+git init
+echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/forest/forest_vm/index.html">' > index.html
+git add .
+git config --global -l
+git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+git push -f -q https://git:${{ GITHUB_TOKEN }}@github.com/${{ forest }} HEAD:gh-pages
\ No newline at end of file

From 518c0c5229f0faf39b82c18c258b4fca3a03f4ba Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 17:06:20 -0500
Subject: [PATCH 003/118] wip

---
 .circleci/config.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a56dcace6715..710b401d5274 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -171,9 +171,12 @@ workflows:
       - lint:
           requires:
             - prefetch-crates
-      - test:
-          requires:
-            - prefetch-crates
-      - test-vectors:
-          requires:
-            - prefetch-crates
+      # - test:
+      #     requires:
+      #       - prefetch-crates
+      # - test-vectors:
+      #     requires:
+      #       - prefetch-crates
+      - publish-docs:
+        requires:
+          - prefetch-crates

From d3cd22fd5098ff9986cef2948835cde6455fa2dc Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 17:08:06 -0500
Subject: [PATCH 004/118] wip

---
 .circleci/config.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 710b401d5274..3d2fe21a421a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -161,8 +161,6 @@ jobs:
       - run:
           name: Publish Docs
           command: scripts/build-rust-docs.sh
-      - persist_to_workspace:
-          root: target/doc
 
 workflows:
   setup_test:
@@ -171,12 +169,6 @@ workflows:
       - lint:
           requires:
             - prefetch-crates
-      # - test:
-      #     requires:
-      #       - prefetch-crates
-      # - test-vectors:
-      #     requires:
-      #       - prefetch-crates
       - publish-docs:
-        requires:
-          - prefetch-crates
+          requires:
+            - prefetch-crates

From 86f9c263e50d2cb3a1b9454c026759be1d16002c Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 17:32:41 -0500
Subject: [PATCH 005/118] wip

---
 .circleci/config.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d2fe21a421a..ea39c7f49b69 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -158,9 +158,19 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
+      - add_ssh_keys:
+          fingerprints:
+            - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
-          command: scripts/build-rust-docs.sh
+          command: |
+                cd target/doc
+                git init
+                echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/forest/forest_vm/index.html">' > index.html
+                git add .
+                git config --global -l
+                git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+                git push -f -q https://git:${{ GITHUB_TOKEN }}@github.com/${{ forest }} HEAD:gh-pages
 
 workflows:
   setup_test:

From 1ea78fdad84c7f6eb561692e9d1a17b3181b1c44 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 20:28:14 -0500
Subject: [PATCH 006/118] wip

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea39c7f49b69..9fd46c8e7dc7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -170,6 +170,7 @@ jobs:
                 git add .
                 git config --global -l
                 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+                echo GITHUB_TOKEN
                 git push -f -q https://git:${{ GITHUB_TOKEN }}@github.com/${{ forest }} HEAD:gh-pages
 
 workflows:

From 6618e0165825d7555f87fe747d910cf51afca212 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 21:04:10 -0500
Subject: [PATCH 007/118] wip

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9fd46c8e7dc7..30a31a867d0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -170,8 +170,8 @@ jobs:
                 git add .
                 git config --global -l
                 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
-                echo GITHUB_TOKEN
-                git push -f -q https://git:${{ GITHUB_TOKEN }}@github.com/${{ forest }} HEAD:gh-pages
+                echo "${GITHUB_TOKEN}"
+                git push -f -q https://git:${$GITHUB_TOKEN}@github.com/forest HEAD:gh-pages
 
 workflows:
   setup_test:

From 310968cf75d156a62919ede84b68ede150aaff50 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 21:30:45 -0500
Subject: [PATCH 008/118] wip

---
 .circleci/config.yml |  2 +-
 scripts/codecov.sh   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 scripts/codecov.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30a31a867d0d..85f5dcc3b59e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -171,7 +171,7 @@ jobs:
                 git config --global -l
                 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
                 echo "${GITHUB_TOKEN}"
-                git push -f -q https://git:${$GITHUB_TOKEN}@github.com/forest HEAD:gh-pages
+                git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
 
 workflows:
   setup_test:
diff --git a/scripts/codecov.sh b/scripts/codecov.sh
new file mode 100644
index 000000000000..2b73d00ae8dc
--- /dev/null
+++ b/scripts/codecov.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Replace 'myproject' by your project name
+REPORT=$(find target/debug -maxdepth 1 -name '<forest-*' -a ! -name '*.d')
+
+for file in $REPORT; do
+    mkdir -p "target/cov/$(basename $file)"
+    kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"
+done
+
+wget -O - -q "https://codecov.io/bash" > .codecov
+chmod +x .codecov
+./.codecov -t $CODECOV_TOKEN
+echo "Uploaded code coverage"
\ No newline at end of file

From 13520fb37058780198233b93fcfe6b3f46a74d5a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 22:00:43 -0500
Subject: [PATCH 009/118] wip

---
 .circleci/config.yml | 22 ++++++++++++++++++++--
 scripts/codecov.sh   |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 85f5dcc3b59e..7c12c8d186d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,8 @@ executors:
   test-executor:
     machine:
       image: ubuntu-1604:202004-01
-    resource_class: large
+    resource_class: xlarge
+  
 
 commands:
   install_rust:
@@ -46,6 +47,8 @@ commands:
             echo 'export CARGO_INCREMENTAL=0' >> $BASH_ENV
             echo 'export CI_TIMEOUT="timeout 40m"' >> $BASH_ENV
             echo 'export CC=gcc' >> $BASH_ENV
+            export RUST_NIGHTLY=$(cat cargo-toolchain)
+            echo 'export RUST_NIGHTLY='"$RUST_NIGHTLY" >> $BASH_ENV
   install_deps:
     steps:
       - run:
@@ -172,14 +175,29 @@ jobs:
                 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
                 echo "${GITHUB_TOKEN}"
                 git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
+  generate-cov:
+    executor: test-executor
+    description: Coverage
+    environment:
+          # Set your codecov token if your repository is private.
+          CODE_COV_TOKEN: ${CODE_COV_TOKEN}
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Upload Coverage
+          command: sh ./scripts/codecov.sh
 
 workflows:
   setup_test:
     jobs:
       - prefetch-crates
-      - lint:
+      - test:
           requires:
             - prefetch-crates
+      - generate-cov:
+          requires:
+            - test
       - publish-docs:
           requires:
             - prefetch-crates
diff --git a/scripts/codecov.sh b/scripts/codecov.sh
index 2b73d00ae8dc..837c0770b611 100644
--- a/scripts/codecov.sh
+++ b/scripts/codecov.sh
@@ -10,5 +10,5 @@ done
 
 wget -O - -q "https://codecov.io/bash" > .codecov
 chmod +x .codecov
-./.codecov -t $CODECOV_TOKEN
+./.codecov -t $CODE_COV_TOKEN
 echo "Uploaded code coverage"
\ No newline at end of file

From 208de4b759c0d048fbade5774d9550f9d7af64e6 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 22:08:46 -0500
Subject: [PATCH 010/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c12c8d186d0..3d36975d0d7a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -174,7 +174,7 @@ jobs:
                 git config --global -l
                 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
                 echo "${GITHUB_TOKEN}"
-                git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
+                git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/dutterbutter.github.io
   generate-cov:
     executor: test-executor
     description: Coverage

From 195269d8a7f4538432ff4da0a3ec49357c49df4a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 22:54:08 -0500
Subject: [PATCH 011/118] wip

---
 .circleci/config.yml       | 31 +++++++++++++++++++++----------
 scripts/build-rust-docs.sh |  3 ++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d36975d0d7a..305ce40c6936 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -113,6 +113,18 @@ jobs:
           name: Fetch workspace dependencies over network
           command: cargo fetch
       - save_cargo_package_cache
+  build-nightly:
+    executor: test-executor
+    description: Checks nightly builds 
+    steps:
+      - checkout
+      - restore_cargo_package_cache
+      - run:
+          name: Nightly builds
+          command: |
+                rustup run nightly rustc --version --verbose
+                rustup run nightly cargo --version --verbose
+                rustup run nightly cargo build
   lint:
     executor: test-executor
     description: Run Rust linting tools.
@@ -128,12 +140,16 @@ jobs:
   test:
     executor: test-executor
     description: Run Rust tests
+    parallelism: 4
     steps:
       - build_setup
       - restore_cargo_package_cache
       - run:
           name: Run Unit Tests
-          command: make test
+          command: |
+                echo $(circleci tests glob "**/*.rs" | circleci tests split --split-by=timings")
+                circleci tests glob "**/*.rs" | circleci tests split --split-by=timings
+                make test
   test-vectors:
     executor: test-executor
     description: Run serialization and conformance tests
@@ -166,15 +182,7 @@ jobs:
             - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
-          command: |
-                cd target/doc
-                git init
-                echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/forest/forest_vm/index.html">' > index.html
-                git add .
-                git config --global -l
-                git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
-                echo "${GITHUB_TOKEN}"
-                git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/dutterbutter.github.io
+          command: sh build-rust-docs.sh
   generate-cov:
     executor: test-executor
     description: Coverage
@@ -201,3 +209,6 @@ workflows:
       - publish-docs:
           requires:
             - prefetch-crates
+      - build-nightly:
+          requires:
+              - prefetch-crates
diff --git a/scripts/build-rust-docs.sh b/scripts/build-rust-docs.sh
index 08c824233b8b..e6f4c54ba331 100644
--- a/scripts/build-rust-docs.sh
+++ b/scripts/build-rust-docs.sh
@@ -6,4 +6,5 @@ echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/
 git add .
 git config --global -l
 git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
-git push -f -q https://git:${{ GITHUB_TOKEN }}@github.com/${{ forest }} HEAD:gh-pages
\ No newline at end of file
+echo "${GITHUB_TOKEN}"
+git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
\ No newline at end of file

From e3988a305fc886c278df1bb0e253f16c44bd8567 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 30 Oct 2020 23:09:21 -0500
Subject: [PATCH 012/118] wip

---
 .circleci/config.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 305ce40c6936..f6a2e0ae919f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,6 +49,9 @@ commands:
             echo 'export CC=gcc' >> $BASH_ENV
             export RUST_NIGHTLY=$(cat cargo-toolchain)
             echo 'export RUST_NIGHTLY='"$RUST_NIGHTLY" >> $BASH_ENV
+            export CARGO_INCREMENTAL=0
+            export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+            export RUSTDOCFLAGS="-Cpanic=abort"
   install_deps:
     steps:
       - run:
@@ -113,18 +116,6 @@ jobs:
           name: Fetch workspace dependencies over network
           command: cargo fetch
       - save_cargo_package_cache
-  build-nightly:
-    executor: test-executor
-    description: Checks nightly builds 
-    steps:
-      - checkout
-      - restore_cargo_package_cache
-      - run:
-          name: Nightly builds
-          command: |
-                rustup run nightly rustc --version --verbose
-                rustup run nightly cargo --version --verbose
-                rustup run nightly cargo build
   lint:
     executor: test-executor
     description: Run Rust linting tools.
@@ -147,7 +138,7 @@ jobs:
       - run:
           name: Run Unit Tests
           command: |
-                echo $(circleci tests glob "**/*.rs" | circleci tests split --split-by=timings")
+                echo $(circleci tests glob "**/*.rs" | circleci tests split --split-by=timings)
                 circleci tests glob "**/*.rs" | circleci tests split --split-by=timings
                 make test
   test-vectors:
@@ -194,7 +185,10 @@ jobs:
       - restore_cargo_package_cache
       - run:
           name: Upload Coverage
-          command: sh ./scripts/codecov.sh
+          command: |
+              cargo test
+              grcov ./target/debug/ -s . -t html --llvm --branch --ignore-not-existing -o ./target/debug/coverage/
+              sh codecov.sh
 
 workflows:
   setup_test:
@@ -209,6 +203,6 @@ workflows:
       - publish-docs:
           requires:
             - prefetch-crates
-      - build-nightly:
-          requires:
-              - prefetch-crates
+      # - build-nightly:
+      #     requires:
+      #         - prefetch-crates

From 7764241a4a8cea82f91a46672b5a489ae162f02d Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 13:09:11 -0500
Subject: [PATCH 013/118] wip

---
 .circleci/config.yml | 30 +++++++++++++++++-------------
 Cargo.lock           |  6 +++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6a2e0ae919f..69e3b56141b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -138,8 +138,8 @@ jobs:
       - run:
           name: Run Unit Tests
           command: |
-                echo $(circleci tests glob "**/*.rs" | circleci tests split --split-by=timings)
-                circleci tests glob "**/*.rs" | circleci tests split --split-by=timings
+                echo $(circleci tests glob "/**/**/tests/*.rs" | circleci tests split --split-by=timings)
+                circleci tests glob "/**/**/tests/*.rs" | circleci tests split --split-by=timings
                 make test
   test-vectors:
     executor: test-executor
@@ -163,7 +163,7 @@ jobs:
     executor: test-executor
     description: Publish documentation to GitHub pages
     steps:
-      - build_setup
+      - checkout
       - restore_cargo_package_cache
       - run:
           name: Build Docs
@@ -173,7 +173,7 @@ jobs:
             - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
-          command: sh build-rust-docs.sh
+          command: bash ./build-rust-docs.sh
   generate-cov:
     executor: test-executor
     description: Coverage
@@ -181,14 +181,20 @@ jobs:
           # Set your codecov token if your repository is private.
           CODE_COV_TOKEN: ${CODE_COV_TOKEN}
     steps:
-      - build_setup
+      - checkout
       - restore_cargo_package_cache
       - run:
-          name: Upload Coverage
+          name: Coverage
           command: |
-              cargo test
-              grcov ./target/debug/ -s . -t html --llvm --branch --ignore-not-existing -o ./target/debug/coverage/
-              sh codecov.sh
+            export PATH=~/.cargo/bin:$PATH
+            # install kcov
+            cargo install cargo-kcov
+            cargo kcov --print-install-kcov-sh | sh
+            echo "Install kcov successfully"
+            # coverage
+            cargo kcov --all -v
+            bash <(curl -s https://codecov.io/bash)
+            echo "Upload code coverage successfully"
 
 workflows:
   setup_test:
@@ -197,12 +203,10 @@ workflows:
       - test:
           requires:
             - prefetch-crates
-      - generate-cov:
-          requires:
-            - test
+      - generate-cov
       - publish-docs:
           requires:
             - prefetch-crates
       # - build-nightly:
       #     requires:
-      #         - prefetch-crates
+      #         - prefetch-crates/**/*.js
diff --git a/Cargo.lock b/Cargo.lock
index 6d0f81a2a90f..217fae14df9a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5332,8 +5332,7 @@ dependencies = [
 [[package]]
 name = "serde_cbor"
 version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+source = "git+https://github.com/ChainSafe/cbor?rev=3e7bf81f57e9010762dbc12292bd6f927fdfe83a#3e7bf81f57e9010762dbc12292bd6f927fdfe83a"
 dependencies = [
  "half",
  "serde",
@@ -5342,7 +5341,8 @@ dependencies = [
 [[package]]
 name = "serde_cbor"
 version = "0.11.1"
-source = "git+https://github.com/ChainSafe/cbor?rev=3e7bf81f57e9010762dbc12292bd6f927fdfe83a#3e7bf81f57e9010762dbc12292bd6f927fdfe83a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
 dependencies = [
  "half",
  "serde",

From a3044c4a35b383b7ef80ef1d09213a4030fc3b53 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 13:13:12 -0500
Subject: [PATCH 014/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 69e3b56141b3..4134cd5007fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -186,7 +186,7 @@ jobs:
       - run:
           name: Coverage
           command: |
-            export PATH=~/.cargo/bin:$PATH
+            export PATH=$HOME/.cargo/bin:$PATH
             # install kcov
             cargo install cargo-kcov
             cargo kcov --print-install-kcov-sh | sh

From 5404cfb556f9c35de3d010cdaee8e24f27c92b8f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 13:14:47 -0500
Subject: [PATCH 015/118] wip

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4134cd5007fd..46a34ecb268d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -203,7 +203,9 @@ workflows:
       - test:
           requires:
             - prefetch-crates
-      - generate-cov
+      - generate-cov:
+          requires:
+            - prefetch-crates
       - publish-docs:
           requires:
             - prefetch-crates

From ee1186016a6062b9615bbfc952f6a26691d9f55e Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 13:23:08 -0500
Subject: [PATCH 016/118] wip

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46a34ecb268d..15b57ff36ecb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,7 +163,7 @@ jobs:
     executor: test-executor
     description: Publish documentation to GitHub pages
     steps:
-      - checkout
+      - build_setup
       - restore_cargo_package_cache
       - run:
           name: Build Docs
@@ -181,7 +181,7 @@ jobs:
           # Set your codecov token if your repository is private.
           CODE_COV_TOKEN: ${CODE_COV_TOKEN}
     steps:
-      - checkout
+      - build_setup
       - restore_cargo_package_cache
       - run:
           name: Coverage

From 16dbc88fa5e75cb7bf5ec160baa91b2af8dcbe86 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 14:43:53 -0500
Subject: [PATCH 017/118] wip

---
 .circleci/config.yml             |   64 +-
 automation/emit_coverage_info.sh |   57 +
 coveralls.json                   | 1751 ++++++++++++++++++++++++++++++
 scripts/codecov.sh               |    2 +-
 4 files changed, 1847 insertions(+), 27 deletions(-)
 create mode 100644 automation/emit_coverage_info.sh
 create mode 100644 coveralls.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 15b57ff36ecb..f9db47467b35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,6 +96,24 @@ commands:
           command: |
             ls -all $HOME/.cargo
             du -ssh $HOME/.cargo
+  install-grcov:
+    steps:
+      - run:
+          name: Install grcov
+          command: |
+            GRCOV_VERSION=v0.5.15
+            GRCOV_ARCHIVE=grcov-linux-x86_64.tar.bz2
+            GRCOV_SHA256=1182739b2b1df31dee74ed3533330001f9da921cf169bd8da4ec0386e4243ad0
+            GRCOV_URL="https://github.com/mozilla/grcov/releases/download/${GRCOV_VERSION}/${GRCOV_ARCHIVE}"
+            curl -sfSL --retry 5 --retry-delay 10 -O "${GRCOV_URL}"
+            echo "${GRCOV_SHA256} *${GRCOV_ARCHIVE}" | shasum -a 256 -c -
+            # Just install `grcov` to ~/.bin
+            mkdir -p "$HOME/.bin"
+            tar jxf "${GRCOV_ARCHIVE}" -C "$HOME/.bin"
+            echo 'export PATH="$HOME/.bin:$PATH"' >> $BASH_ENV
+      # Run in a different shell to source $BASH_ENV
+      - run: |
+          grcov --version
   build_setup:
     description: Sets up environment for future jobs
     steps:
@@ -137,10 +155,7 @@ jobs:
       - restore_cargo_package_cache
       - run:
           name: Run Unit Tests
-          command: |
-                echo $(circleci tests glob "/**/**/tests/*.rs" | circleci tests split --split-by=timings)
-                circleci tests glob "/**/**/tests/*.rs" | circleci tests split --split-by=timings
-                make test
+          command: make test
   test-vectors:
     executor: test-executor
     description: Run serialization and conformance tests
@@ -173,28 +188,22 @@ jobs:
             - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
-          command: bash ./build-rust-docs.sh
-  generate-cov:
-    executor: test-executor
-    description: Coverage
-    environment:
-          # Set your codecov token if your repository is private.
-          CODE_COV_TOKEN: ${CODE_COV_TOKEN}
+          command: bash ./scripts/build-rust-docs.sh
+  cov:
+    docker:
+      - image: circleci/rust:latest
+    resource_class: medium
     steps:
+      # Need to use nightly for this.
       - build_setup
-      - restore_cargo_package_cache
+      - install-grcov
+      - run: bash ./automation/emit_coverage_info.sh
       - run:
-          name: Coverage
-          command: |
-            export PATH=$HOME/.cargo/bin:$PATH
-            # install kcov
-            cargo install cargo-kcov
-            cargo kcov --print-install-kcov-sh | sh
-            echo "Install kcov successfully"
-            # coverage
-            cargo kcov --all -v
-            bash <(curl -s https://codecov.io/bash)
-            echo "Upload code coverage successfully"
+          name: Compile coverage
+          command: grcov ./target/debug/ -s . -t lcov --llvm --ignore-not-existing --ignore "target/*" --ignore "/*" -o lcov.info
+      - run:
+          name: Upload to codecov.io
+          command: bash <(curl -s https://codecov.io/bash) -f lcov.info
 
 workflows:
   setup_test:
@@ -203,12 +212,15 @@ workflows:
       - test:
           requires:
             - prefetch-crates
-      - generate-cov:
-          requires:
-            - prefetch-crates
+  docs:
+    jobs:
+      - prefetch-crates
       - publish-docs:
           requires:
             - prefetch-crates
+  coverage:
+    jobs:
+      - cov
       # - build-nightly:
       #     requires:
       #         - prefetch-crates/**/*.js
diff --git a/automation/emit_coverage_info.sh b/automation/emit_coverage_info.sh
new file mode 100644
index 000000000000..61811a466a94
--- /dev/null
+++ b/automation/emit_coverage_info.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Run tests in order to produce coverage data. Does not collect coverage data,
+# just produces it. Note that we ignore all test failures -- some of the
+# experimental flags we use cause test failures, we don't really care, other CI
+# tasks check this anyway.
+#
+# Note that running this outside of CI doesn't work on all platforms. In
+# particular, macos needs further patches in order to work, probably windows
+# too. It's really intended for use inside CI only.
+#
+# Finally, this must be done on nightly -- `cargo-tarpaulin`, which works on
+# stable, also has issues with NSS, but not ones that seem easy to work around.
+# As a result, we use `grcov`. Ultimately `grcov` should long-term allow us to
+# integrate coverage data from over the FFI, which is a huge plus to this
+# approach, so it's probably for the best, even if `grcov`'s actual coverage
+# information seems to be of lower quality than `tarpaulin`.
+
+if [[ ! -f "$PWD/automation/emit_coverage_info.sh" ]]
+then
+    echo "emit_coverage_info.sh must be executed from the root directory."
+    exit 1
+fi
+
+cargo +nightly clean
+# Note that incremental builds, as well as sccache seems to break coverage :(.
+# So, we disable those.
+export CARGO_INCREMENTAL=0
+unset RUSTC_WRAPPER
+# TODO: re-add `-Clink-dead-code` to RUSTFLAGS -- right now it causes a build
+# linker error in NSS, as apparently some part of NSS we don't use doesn't have
+# the build flags set up correctly. This makes our code coverage accuracy worse,
+# but AFAICT, not in a massive way -- or at least codecov.io seems to account
+# for it in some manner.
+#
+# Also, this `--cfg coverage` is how the `#[cfg(coverage)]` we use in some parts
+# of the rust code comes into existence (it's non-standard)
+export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort --cfg coverage";
+export RUSTDOCFLAGS="-Cpanic=abort"
+
+# Apparently --no-default-features doesn't work in the root, even with -p to select a specific package.
+# Instead we pull the list of individual package manifest files which have default features
+# out of `cargo metadata` and test using --manifest-path for each individual package.
+for manifest in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select((.features | .default | length) > 0) | .manifest_path'); do
+    package=$(dirname "$manifest")
+    package=$(basename "$package")
+    echo "## no-default-features test for package $package (manifest @ $manifest)"
+    cargo +nightly test --manifest-path "$manifest" --no-default-features --no-fail-fast || true
+done
+
+cargo +nightly test --all --no-fail-fast || true
+
+cargo +nightly run -p sync-test || true
+cargo +nightly run -p protobuf-gen -- tools/protobuf_files.toml || true
+cargo +nightly run -p systest || true
+
+env RUSTFLAGS="--cfg __appsvc_ci_hack $RUSTFLAGS" cargo +nightly test --all --all-features --no-fail-fast || true
\ No newline at end of file
diff --git a/coveralls.json b/coveralls.json
new file mode 100644
index 000000000000..153b5251cacc
--- /dev/null
+++ b/coveralls.json
@@ -0,0 +1,1751 @@
+#!/usr/bin/env bash
+
+# Apache License Version 2.0, January 2004
+# https://github.com/codecov/codecov-bash/blob/master/LICENSE
+
+
+set -e +o pipefail
+
+VERSION="20201009-048fee3"
+
+codecov_flags=( )
+url="https://codecov.io"
+env="$CODECOV_ENV"
+service=""
+token=""
+search_in=""
+# shellcheck disable=SC2153
+flags="$CODECOV_FLAGS"
+exit_with=0
+curlargs=""
+curlawsargs=""
+dump="0"
+clean="0"
+curl_s="-s"
+name="$CODECOV_NAME"
+include_cov=""
+exclude_cov=""
+ddp="$HOME/Library/Developer/Xcode/DerivedData"
+xp=""
+files=""
+save_to=""
+cacert="$CODECOV_CA_BUNDLE"
+gcov_ignore="-not -path './bower_components/**' -not -path './node_modules/**' -not -path './vendor/**'"
+gcov_include=""
+
+ft_gcov="1"
+ft_coveragepy="1"
+ft_fix="1"
+ft_search="1"
+ft_s3="1"
+ft_network="1"
+ft_xcodellvm="1"
+ft_xcodeplist="0"
+ft_gcovout="1"
+ft_html="0"
+
+_git_root=$(git rev-parse --show-toplevel 2>/dev/null || hg root 2>/dev/null || echo "$PWD")
+git_root="$_git_root"
+remote_addr=""
+if [ "$git_root" = "$PWD" ];
+then
+  git_root="."
+fi
+
+url_o=""
+pr_o=""
+build_o=""
+commit_o=""
+search_in_o=""
+tag_o=""
+branch_o=""
+slug_o=""
+prefix_o=""
+git_ls_files_recurse_submodules_o=""
+
+commit="$VCS_COMMIT_ID"
+branch="$VCS_BRANCH_NAME"
+pr="$VCS_PULL_REQUEST"
+slug="$VCS_SLUG"
+tag="$VCS_TAG"
+build_url="$CI_BUILD_URL"
+build="$CI_BUILD_ID"
+job="$CI_JOB_ID"
+
+beta_xcode_partials=""
+
+proj_root="$git_root"
+gcov_exe="gcov"
+gcov_arg=""
+
+b="\033[0;36m"
+g="\033[0;32m"
+r="\033[0;31m"
+e="\033[0;90m"
+x="\033[0m"
+
+show_help() {
+cat << EOF
+
+                Codecov Bash $VERSION
+
+          Global report uploading tool for Codecov
+       Documentation at https://docs.codecov.io/docs
+    Contribute at https://github.com/codecov/codecov-bash
+
+
+    -h          Display this help and exit
+    -f FILE     Target file(s) to upload
+
+                 -f "path/to/file"     only upload this file
+                                       skips searching unless provided patterns below
+
+                 -f '!*.bar'           ignore all files at pattern *.bar
+                 -f '*.foo'            include all files at pattern *.foo
+                 Must use single quotes.
+                 This is non-exclusive, use -s "*.foo" to match specific paths.
+
+    -s DIR       Directory to search for coverage reports.
+                 Already searches project root and artifact folders.
+    -t TOKEN     Set the private repository token
+                 (option) set environment variable CODECOV_TOKEN=:uuid
+
+                 -t @/path/to/token_file
+                 -t uuid
+
+    -n NAME      Custom defined name of the upload. Visible in Codecov UI
+
+    -e ENV       Specify environment variables to be included with this build
+                 Also accepting environment variables: CODECOV_ENV=VAR,VAR2
+
+                 -e VAR,VAR2
+
+    -X feature   Toggle functionalities
+
+                 -X gcov          Disable gcov
+                 -X coveragepy    Disable python coverage
+                 -X fix           Disable report fixing
+                 -X search        Disable searching for reports
+                 -X xcode         Disable xcode processing
+                 -X network       Disable uploading the file network
+                 -X gcovout       Disable gcov output
+                 -X html          Enable coverage for HTML files
+                 -X recursesubs   Enable recurse submodules in git projects when searching for source files
+
+    -N           The commit SHA of the parent for which you are uploading coverage. If not present,
+                 the parent will be determined using the API of your repository provider.
+                 When using the repository provider's API, the parent is determined via finding
+                 the closest ancestor to the commit.
+
+    -R root dir  Used when not in git/hg project to identify project root directory
+    -F flag      Flag the upload to group coverage metrics
+
+                 -F unittests        This upload is only unittests
+                 -F integration      This upload is only integration tests
+                 -F ui,chrome        This upload is Chrome - UI tests
+
+    -c           Move discovered coverage reports to the trash
+    -Z           Exit with 1 if not successful. Default will Exit with 0
+
+    -- xcode --
+    -D           Custom Derived Data Path for Coverage.profdata and gcov processing
+                 Default '~/Library/Developer/Xcode/DerivedData'
+    -J           Specify packages to build coverage. Uploader will only build these packages.
+                 This can significantly reduces time to build coverage reports.
+
+                 -J 'MyAppName'      Will match "MyAppName" and "MyAppNameTests"
+                 -J '^ExampleApp$'   Will match only "ExampleApp" not "ExampleAppTests"
+
+    -- gcov --
+    -g GLOB      Paths to ignore during gcov gathering
+    -G GLOB      Paths to include during gcov gathering
+    -p dir       Project root directory
+                 Also used when preparing gcov
+    -k prefix    Prefix filepaths to help resolve path fixing: https://github.com/codecov/support/issues/472
+    -x gcovexe   gcov executable to run. Defaults to 'gcov'
+    -a gcovargs  extra arguments to pass to gcov
+
+    -- Override CI Environment Variables --
+       These variables are automatically detected by popular CI providers
+
+    -B branch    Specify the branch name
+    -C sha       Specify the commit sha
+    -P pr        Specify the pull request number
+    -b build     Specify the build number
+    -T tag       Specify the git tag
+
+    -- Enterprise --
+    -u URL       Set the target url for Enterprise customers
+                 Not required when retrieving the bash uploader from your CCE
+                 (option) Set environment variable CODECOV_URL=https://my-hosted-codecov.com
+    -r SLUG      owner/repo slug used instead of the private repo token in Enterprise
+                 (option) set environment variable CODECOV_SLUG=:owner/:repo
+                 (option) set in your codecov.yml "codecov.slug"
+    -S PATH      File path to your cacert.pem file used to verify ssl with Codecov Enterprise (optional)
+                 (option) Set environment variable: CODECOV_CA_BUNDLE="/path/to/ca.pem"
+    -U curlargs  Extra curl arguments to communicate with Codecov. e.g., -U "--proxy http://http-proxy"
+    -A curlargs  Extra curl arguments to communicate with AWS.
+
+    -- Debugging --
+    -d           Don't upload, but dump upload file to stdout
+    -q PATH      Write upload file to path
+    -K           Remove color from the output
+    -v           Verbose mode
+
+EOF
+}
+
+
+say() {
+  echo -e "$1"
+}
+
+
+urlencode() {
+  echo "$1" | curl -Gso /dev/null -w "%{url_effective}" --data-urlencode @- "" | cut -c 3- | sed -e 's/%0A//'
+}
+
+
+swiftcov() {
+  _dir=$(dirname "$1" | sed 's/\(Build\).*/\1/g')
+  for _type in app framework xctest
+  do
+    find "$_dir" -name "*.$_type" | while read -r f
+    do
+      _proj=${f##*/}
+      _proj=${_proj%."$_type"}
+      if [ "$2" = "" ] || [ "$(echo "$_proj" | grep -i "$2")" != "" ];
+      then
+        say "    $g+$x Building reports for $_proj $_type"
+        dest=$([ -f "$f/$_proj" ] && echo "$f/$_proj" || echo "$f/Contents/MacOS/$_proj")
+        # shellcheck disable=SC2001
+        _proj_name=$(echo "$_proj" | sed -e 's/[[:space:]]//g')
+        # shellcheck disable=SC2086
+        xcrun llvm-cov show $beta_xcode_partials -instr-profile "$1" "$dest" > "$_proj_name.$_type.coverage.txt" \
+         || say "    ${r}x>${x} llvm-cov failed to produce results for $dest"
+      fi
+    done
+  done
+}
+
+
+# Credits to: https://gist.github.com/pkuczynski/8665367
+parse_yaml() {
+   local prefix=$2
+   local s='[[:space:]]*' w='[a-zA-Z0-9_]*'
+   local fs
+   fs=$(echo @|tr @ '\034')
+   sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" |
+   awk -F"$fs" '{
+      indent = length($1)/2;
+      vname[indent] = $2;
+      for (i in vname) {if (i > indent) {delete vname[i]}}
+      if (length($3) > 0) {
+         vn=""; if (indent > 0) {vn=(vn)(vname[0])("_")}
+         printf("%s%s%s=\"%s\"\n", "'"$prefix"'",vn, $2, $3);
+      }
+   }'
+}
+
+
+if [ $# != 0 ];
+then
+  while getopts "a:A:b:B:cC:dD:e:f:F:g:G:hJ:k:Kn:p:P:q:r:R:s:S:t:T:u:U:vx:X:ZN:" o
+  do
+    codecov_flags+=( "$o" )
+    case "$o" in
+      "N")
+        parent=$OPTARG
+        ;;
+      "a")
+        gcov_arg=$OPTARG
+        ;;
+      "A")
+        curlawsargs="$OPTARG"
+        ;;
+      "b")
+        build_o="$OPTARG"
+        ;;
+      "B")
+        branch_o="$OPTARG"
+        ;;
+      "c")
+        clean="1"
+        ;;
+      "C")
+        commit_o="$OPTARG"
+        ;;
+      "d")
+        dump="1"
+        ;;
+      "D")
+        ddp="$OPTARG"
+        ;;
+      "e")
+        env="$env,$OPTARG"
+        ;;
+      "f")
+        if [ "${OPTARG::1}" = "!" ];
+        then
+          exclude_cov="$exclude_cov -not -path '${OPTARG:1}'"
+
+        elif [[ "$OPTARG" = *"*"* ]];
+        then
+          include_cov="$include_cov -or -name '$OPTARG'"
+
+        else
+          ft_search=0
+          if [ "$files" = "" ];
+          then
+            files="$OPTARG"
+          else
+            files="$files
+$OPTARG"
+          fi
+        fi
+        ;;
+      "F")
+        if [ "$flags" = "" ];
+        then
+          flags="$OPTARG"
+        else
+          flags="$flags,$OPTARG"
+        fi
+        ;;
+      "g")
+        gcov_ignore="$gcov_ignore -not -path '$OPTARG'"
+        ;;
+      "G")
+        gcov_include="$gcov_include -path '$OPTARG'"
+        ;;
+      "h")
+        show_help
+        exit 0;
+        ;;
+      "J")
+        ft_xcodellvm="1"
+        ft_xcodeplist="0"
+        if [ "$xp" = "" ];
+        then
+          xp="$OPTARG"
+        else
+          xp="$xp\|$OPTARG"
+        fi
+        ;;
+      "k")
+        prefix_o=$(echo "$OPTARG" | sed -e 's:^/*::' -e 's:/*$::')
+        ;;
+      "K")
+        b=""
+        g=""
+        r=""
+        e=""
+        x=""
+        ;;
+      "n")
+        name="$OPTARG"
+        ;;
+      "p")
+        proj_root="$OPTARG"
+        ;;
+      "P")
+        pr_o="$OPTARG"
+        ;;
+      "q")
+        save_to="$OPTARG"
+        ;;
+      "r")
+        slug_o="$OPTARG"
+        ;;
+      "R")
+        git_root="$OPTARG"
+        ;;
+      "s")
+        if [ "$search_in_o" = "" ];
+        then
+          search_in_o="$OPTARG"
+        else
+          search_in_o="$search_in_o $OPTARG"
+        fi
+        ;;
+      "S")
+        # shellcheck disable=SC2089
+        cacert="--cacert \"$OPTARG\""
+        ;;
+      "t")
+        if [ "${OPTARG::1}" = "@" ];
+        then
+          token=$(< "${OPTARG:1}" tr -d ' \n')
+        else
+          token="$OPTARG"
+        fi
+        ;;
+      "T")
+        tag_o="$OPTARG"
+        ;;
+      "u")
+        url_o=$(echo "$OPTARG" | sed -e 's/\/$//')
+        ;;
+      "U")
+        curlargs="$OPTARG"
+        ;;
+      "v")
+        set -x
+        curl_s=""
+        ;;
+      "x")
+        gcov_exe=$OPTARG
+        ;;
+      "X")
+        if [ "$OPTARG" = "gcov" ];
+        then
+          ft_gcov="0"
+        elif [ "$OPTARG" = "coveragepy" ] || [ "$OPTARG" = "py" ];
+        then
+          ft_coveragepy="0"
+        elif [ "$OPTARG" = "gcovout" ];
+        then
+          ft_gcovout="0"
+        elif [ "$OPTARG" = "xcodellvm" ];
+        then
+          ft_xcodellvm="1"
+          ft_xcodeplist="0"
+        elif [ "$OPTARG" = "fix" ] || [ "$OPTARG" = "fixes" ];
+        then
+          ft_fix="0"
+        elif [ "$OPTARG" = "xcode" ];
+        then
+          ft_xcodellvm="0"
+          ft_xcodeplist="0"
+        elif [ "$OPTARG" = "search" ];
+        then
+          ft_search="0"
+        elif [ "$OPTARG" = "xcodepartials" ];
+        then
+          beta_xcode_partials="-use-color"
+        elif [ "$OPTARG" = "network" ];
+        then
+          ft_network="0"
+        elif [ "$OPTARG" = "s3" ];
+        then
+          ft_s3="0"
+        elif [ "$OPTARG" = "html" ];
+        then
+          ft_html="1"
+        elif [ "$OPTARG" = "recursesubs" ];
+        then
+          git_ls_files_recurse_submodules_o="--recurse-submodules"
+        fi
+        ;;
+      "Z")
+        exit_with=1
+        ;;
+      *)
+        echo -e "${r}Unexpected flag not supported${x}"
+        ;;
+    esac
+  done
+fi
+
+say "
+  _____          _
+ / ____|        | |
+| |     ___   __| | ___  ___ _____   __
+| |    / _ \\ / _\` |/ _ \\/ __/ _ \\ \\ / /
+| |___| (_) | (_| |  __/ (_| (_) \\ V /
+ \\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
+                              Bash-$VERSION
+
+"
+
+search_in="$proj_root"
+
+#shellcheck disable=SC2154
+if [ "$JENKINS_URL" != "" ];
+then
+  say "$e==>$x Jenkins CI detected."
+  # https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project
+  # https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin#GitHubpullrequestbuilderplugin-EnvironmentVariables
+  service="jenkins"
+
+  # shellcheck disable=SC2154
+  if [ "$ghprbSourceBranch" != "" ];
+  then
+     branch="$ghprbSourceBranch"
+  elif [ "$GIT_BRANCH" != "" ];
+  then
+     branch="$GIT_BRANCH"
+  elif [ "$BRANCH_NAME" != "" ];
+  then
+    branch="$BRANCH_NAME"
+  fi
+
+  # shellcheck disable=SC2154
+  if [ "$ghprbActualCommit" != "" ];
+  then
+    commit="$ghprbActualCommit"
+  elif [ "$GIT_COMMIT" != "" ];
+  then
+    commit="$GIT_COMMIT"
+  fi
+
+  # shellcheck disable=SC2154
+  if [ "$ghprbPullId" != "" ];
+  then
+    pr="$ghprbPullId"
+  elif [ "$CHANGE_ID" != "" ];
+  then
+    pr="$CHANGE_ID"
+  fi
+
+  build="$BUILD_NUMBER"
+  # shellcheck disable=SC2153
+  build_url=$(urlencode "$BUILD_URL")
+
+elif [ "$CI" = "true" ] && [ "$TRAVIS" = "true" ] && [ "$SHIPPABLE" != "true" ];
+then
+  say "$e==>$x Travis CI detected."
+  # https://docs.travis-ci.com/user/environment-variables/
+  service="travis"
+  commit="${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT}"
+  build="$TRAVIS_JOB_NUMBER"
+  pr="$TRAVIS_PULL_REQUEST"
+  job="$TRAVIS_JOB_ID"
+  slug="$TRAVIS_REPO_SLUG"
+  env="$env,TRAVIS_OS_NAME"
+  tag="$TRAVIS_TAG"
+  if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ];
+  then
+    branch="$TRAVIS_BRANCH"
+  fi
+
+  language=$(compgen -A variable | grep "^TRAVIS_.*_VERSION$" | head -1)
+  if [ "$language" != "" ];
+  then
+    env="$env,${!language}"
+  fi
+
+elif [ "$CODEBUILD_CI" = "true" ];
+then
+  say "$e==>$x AWS Codebuild detected."
+  # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
+  service="codebuild"
+  commit="$CODEBUILD_RESOLVED_SOURCE_VERSION"
+  build="$CODEBUILD_BUILD_ID"
+  branch="$(echo "$CODEBUILD_WEBHOOK_HEAD_REF" | sed 's/^refs\/heads\///')"
+  if [ "${CODEBUILD_SOURCE_VERSION/pr}" = "$CODEBUILD_SOURCE_VERSION" ] ; then
+    pr="false"
+  else
+    pr="$(echo "$CODEBUILD_SOURCE_VERSION" | sed 's/^pr\///')"
+  fi
+  job="$CODEBUILD_BUILD_ID"
+  slug="$(echo "$CODEBUILD_SOURCE_REPO_URL" | sed 's/^.*:\/\/[^\/]*\///' | sed 's/\.git$//')"
+
+elif [ "$DOCKER_REPO" != "" ];
+then
+  say "$e==>$x Docker detected."
+  # https://docs.docker.com/docker-cloud/builds/advanced/
+  service="docker"
+  branch="$SOURCE_BRANCH"
+  commit="$SOURCE_COMMIT"
+  slug="$DOCKER_REPO"
+  tag="$CACHE_TAG"
+  env="$env,IMAGE_NAME"
+
+elif [ "$CI" = "true" ] && [ "$CI_NAME" = "codeship" ];
+then
+  say "$e==>$x Codeship CI detected."
+  # https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
+  service="codeship"
+  branch="$CI_BRANCH"
+  build="$CI_BUILD_NUMBER"
+  build_url=$(urlencode "$CI_BUILD_URL")
+  commit="$CI_COMMIT_ID"
+
+elif [ -n "$CF_BUILD_URL" ] && [ -n "$CF_BUILD_ID" ];
+then
+  say "$e==>$x Codefresh CI detected."
+  # https://docs.codefresh.io/v1.0/docs/variables
+  service="codefresh"
+  branch="$CF_BRANCH"
+  build="$CF_BUILD_ID"
+  build_url=$(urlencode "$CF_BUILD_URL")
+  commit="$CF_REVISION"
+
+elif [ "$TEAMCITY_VERSION" != "" ];
+then
+  say "$e==>$x TeamCity CI detected."
+  # https://confluence.jetbrains.com/display/TCD8/Predefined+Build+Parameters
+  # https://confluence.jetbrains.com/plugins/servlet/mobile#content/view/74847298
+  if [ "$TEAMCITY_BUILD_BRANCH" = '' ];
+  then
+    echo "    Teamcity does not automatically make build parameters available as environment variables."
+    echo "    Add the following environment parameters to the build configuration"
+    echo "    env.TEAMCITY_BUILD_BRANCH = %teamcity.build.branch%"
+    echo "    env.TEAMCITY_BUILD_ID = %teamcity.build.id%"
+    echo "    env.TEAMCITY_BUILD_URL = %teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%"
+    echo "    env.TEAMCITY_BUILD_COMMIT = %system.build.vcs.number%"
+    echo "    env.TEAMCITY_BUILD_REPOSITORY = %vcsroot.<YOUR TEAMCITY VCS NAME>.url%"
+  fi
+  service="teamcity"
+  branch="$TEAMCITY_BUILD_BRANCH"
+  build="$TEAMCITY_BUILD_ID"
+  build_url=$(urlencode "$TEAMCITY_BUILD_URL")
+  if [ "$TEAMCITY_BUILD_COMMIT" != "" ];
+  then
+    commit="$TEAMCITY_BUILD_COMMIT"
+  else
+    commit="$BUILD_VCS_NUMBER"
+  fi
+  remote_addr="$TEAMCITY_BUILD_REPOSITORY"
+
+elif [ "$CI" = "true" ] && [ "$CIRCLECI" = "true" ];
+then
+  say "$e==>$x Circle CI detected."
+  # https://circleci.com/docs/environment-variables
+  service="circleci"
+  branch="$CIRCLE_BRANCH"
+  build="$CIRCLE_BUILD_NUM"
+  job="$CIRCLE_NODE_INDEX"
+  if [ "$CIRCLE_PROJECT_REPONAME" != "" ];
+  then
+    slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
+  else
+    # git@github.com:owner/repo.git
+    slug="${CIRCLE_REPOSITORY_URL##*:}"
+    # owner/repo.git
+    slug="${slug%%.git}"
+  fi
+  pr="$CIRCLE_PR_NUMBER"
+  commit="$CIRCLE_SHA1"
+  search_in="$search_in $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS"
+
+elif [ "$BUDDYBUILD_BRANCH" != "" ];
+then
+  say "$e==>$x buddybuild detected"
+  # http://docs.buddybuild.com/v6/docs/custom-prebuild-and-postbuild-steps
+  service="buddybuild"
+  branch="$BUDDYBUILD_BRANCH"
+  build="$BUDDYBUILD_BUILD_NUMBER"
+  build_url="https://dashboard.buddybuild.com/public/apps/$BUDDYBUILD_APP_ID/build/$BUDDYBUILD_BUILD_ID"
+  # BUDDYBUILD_TRIGGERED_BY
+  if [ "$ddp" = "$HOME/Library/Developer/Xcode/DerivedData" ];
+  then
+    ddp="/private/tmp/sandbox/${BUDDYBUILD_APP_ID}/bbtest"
+  fi
+
+elif [ "${bamboo_planRepository_revision}" != "" ];
+then
+  say "$e==>$x Bamboo detected"
+  # https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html#Bamboovariables-Build-specificvariables
+  service="bamboo"
+  commit="${bamboo_planRepository_revision}"
+  # shellcheck disable=SC2154
+  branch="${bamboo_planRepository_branch}"
+  # shellcheck disable=SC2154
+  build="${bamboo_buildNumber}"
+  # shellcheck disable=SC2154
+  build_url="${bamboo_buildResultsUrl}"
+  # shellcheck disable=SC2154
+  remote_addr="${bamboo_planRepository_repositoryUrl}"
+
+elif [ "$CI" = "true" ] && [ "$BITRISE_IO" = "true" ];
+then
+  # http://devcenter.bitrise.io/faq/available-environment-variables/
+  say "$e==>$x Bitrise CI detected."
+  service="bitrise"
+  branch="$BITRISE_GIT_BRANCH"
+  build="$BITRISE_BUILD_NUMBER"
+  build_url=$(urlencode "$BITRISE_BUILD_URL")
+  pr="$BITRISE_PULL_REQUEST"
+  if [ "$GIT_CLONE_COMMIT_HASH" != "" ];
+  then
+    commit="$GIT_CLONE_COMMIT_HASH"
+  fi
+
+elif [ "$CI" = "true" ] && [ "$SEMAPHORE" = "true" ];
+then
+  say "$e==>$x Semaphore CI detected."
+# https://docs.semaphoreci.com/ci-cd-environment/environment-variables/#semaphore-related
+  service="semaphore"
+  branch="$SEMAPHORE_GIT_BRANCH"
+  build="$SEMAPHORE_WORKFLOW_NUMBER"
+  job="$SEMAPHORE_JOB_ID"
+  pr="$PULL_REQUEST_NUMBER"
+  slug="$SEMAPHORE_REPO_SLUG"
+  commit="$REVISION"
+  env="$env,SEMAPHORE_TRIGGER_SOURCE"
+
+elif [ "$CI" = "true" ] && [ "$BUILDKITE" = "true" ];
+then
+  say "$e==>$x Buildkite CI detected."
+  # https://buildkite.com/docs/guides/environment-variables
+  service="buildkite"
+  branch="$BUILDKITE_BRANCH"
+  build="$BUILDKITE_BUILD_NUMBER"
+  job="$BUILDKITE_JOB_ID"
+  build_url=$(urlencode "$BUILDKITE_BUILD_URL")
+  slug="$BUILDKITE_PROJECT_SLUG"
+  commit="$BUILDKITE_COMMIT"
+  if [[ "$BUILDKITE_PULL_REQUEST" != "false" ]]; then
+    pr="$BUILDKITE_PULL_REQUEST"
+  fi
+  tag="$BUILDKITE_TAG"
+
+elif [ "$CI" = "drone" ] || [ "$DRONE" = "true" ];
+then
+  say "$e==>$x Drone CI detected."
+  # http://docs.drone.io/env.html
+  # drone commits are not full shas
+  service="drone.io"
+  branch="$DRONE_BRANCH"
+  build="$DRONE_BUILD_NUMBER"
+  build_url=$(urlencode "${DRONE_BUILD_LINK}")
+  pr="$DRONE_PULL_REQUEST"
+  job="$DRONE_JOB_NUMBER"
+  tag="$DRONE_TAG"
+
+elif [ "$CI" = "true" ] && [ "$HEROKU_TEST_RUN_BRANCH" != "" ];
+then
+  say "$e==>$x Heroku CI detected."
+  # https://devcenter.heroku.com/articles/heroku-ci#environment-variables
+  service="heroku"
+  branch="$HEROKU_TEST_RUN_BRANCH"
+  build="$HEROKU_TEST_RUN_ID"
+  commit="$HEROKU_TEST_RUN_COMMIT_VERSION"
+
+elif [[ "$CI" = "true" || "$CI" = "True" ]] && [[ "$APPVEYOR" = "true" || "$APPVEYOR" = "True" ]];
+then
+  say "$e==>$x Appveyor CI detected."
+  # http://www.appveyor.com/docs/environment-variables
+  service="appveyor"
+  branch="$APPVEYOR_REPO_BRANCH"
+  build=$(urlencode "$APPVEYOR_JOB_ID")
+  pr="$APPVEYOR_PULL_REQUEST_NUMBER"
+  job="$APPVEYOR_ACCOUNT_NAME%2F$APPVEYOR_PROJECT_SLUG%2F$APPVEYOR_BUILD_VERSION"
+  slug="$APPVEYOR_REPO_NAME"
+  commit="$APPVEYOR_REPO_COMMIT"
+  build_url=$(urlencode "${APPVEYOR_URL}/project/${APPVEYOR_REPO_NAME}/builds/$APPVEYOR_BUILD_ID/job/${APPVEYOR_JOB_ID}")
+
+elif [ "$CI" = "true" ] && [ "$WERCKER_GIT_BRANCH" != "" ];
+then
+  say "$e==>$x Wercker CI detected."
+  # http://devcenter.wercker.com/articles/steps/variables.html
+  service="wercker"
+  branch="$WERCKER_GIT_BRANCH"
+  build="$WERCKER_MAIN_PIPELINE_STARTED"
+  slug="$WERCKER_GIT_OWNER/$WERCKER_GIT_REPOSITORY"
+  commit="$WERCKER_GIT_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$MAGNUM" = "true" ];
+then
+  say "$e==>$x Magnum CI detected."
+  # https://magnum-ci.com/docs/environment
+  service="magnum"
+  branch="$CI_BRANCH"
+  build="$CI_BUILD_NUMBER"
+  commit="$CI_COMMIT"
+
+elif [ "$SHIPPABLE" = "true" ];
+then
+  say "$e==>$x Shippable CI detected."
+  # http://docs.shippable.com/ci_configure/
+  service="shippable"
+  # shellcheck disable=SC2153
+  branch=$([ "$HEAD_BRANCH" != "" ] && echo "$HEAD_BRANCH" || echo "$BRANCH")
+  build="$BUILD_NUMBER"
+  build_url=$(urlencode "$BUILD_URL")
+  pr="$PULL_REQUEST"
+  slug="$REPO_FULL_NAME"
+  # shellcheck disable=SC2153
+  commit="$COMMIT"
+
+elif [ "$TDDIUM" = "true" ];
+then
+  say "Solano CI detected."
+  # http://docs.solanolabs.com/Setup/tddium-set-environment-variables/
+  service="solano"
+  commit="$TDDIUM_CURRENT_COMMIT"
+  branch="$TDDIUM_CURRENT_BRANCH"
+  build="$TDDIUM_TID"
+  pr="$TDDIUM_PR_ID"
+
+elif [ "$GREENHOUSE" = "true" ];
+then
+  say "$e==>$x Greenhouse CI detected."
+  # http://docs.greenhouseci.com/docs/environment-variables-files
+  service="greenhouse"
+  branch="$GREENHOUSE_BRANCH"
+  build="$GREENHOUSE_BUILD_NUMBER"
+  build_url=$(urlencode "$GREENHOUSE_BUILD_URL")
+  pr="$GREENHOUSE_PULL_REQUEST"
+  commit="$GREENHOUSE_COMMIT"
+  search_in="$search_in $GREENHOUSE_EXPORT_DIR"
+
+elif [ "$GITLAB_CI" != "" ];
+then
+  say "$e==>$x GitLab CI detected."
+  # http://doc.gitlab.com/ce/ci/variables/README.html
+  service="gitlab"
+  branch="${CI_BUILD_REF_NAME:-$CI_COMMIT_REF_NAME}"
+  build="${CI_BUILD_ID:-$CI_JOB_ID}"
+  remote_addr="${CI_BUILD_REPO:-$CI_REPOSITORY_URL}"
+  commit="${CI_BUILD_REF:-$CI_COMMIT_SHA}"
+  slug="${CI_PROJECT_PATH}"
+
+elif [ "$GITHUB_ACTIONS" != "" ];
+then
+  say "$e==>$x GitHub Actions detected."
+
+  # https://github.com/features/actions
+  service="github-actions"
+
+  # https://help.github.com/en/articles/virtual-environments-for-github-actions#environment-variables
+  branch="${GITHUB_REF#refs/heads/}"
+  if [  "$GITHUB_HEAD_REF" != "" ];
+  then
+    # PR refs are in the format: refs/pull/7/merge
+    pr="${GITHUB_REF#refs/pull/}"
+    pr="${pr%/merge}"
+    branch="${GITHUB_HEAD_REF}"
+  fi
+  commit="${GITHUB_SHA}"
+  slug="${GITHUB_REPOSITORY}"
+  build="${GITHUB_RUN_ID}"
+  build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}")
+
+elif [ "$SYSTEM_TEAMFOUNDATIONSERVERURI" != "" ];
+then
+  say "$e==>$x Azure Pipelines detected."
+  # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=vsts
+  # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&viewFallbackFrom=vsts&tabs=yaml
+  service="azure_pipelines"
+  commit="$BUILD_SOURCEVERSION"
+  build="$BUILD_BUILDNUMBER"
+  if [  -z "$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" ];
+  then
+    pr="$SYSTEM_PULLREQUEST_PULLREQUESTID"
+  else
+    pr="$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
+  fi
+  project="${SYSTEM_TEAMPROJECT}"
+  server_uri="${SYSTEM_TEAMFOUNDATIONSERVERURI}"
+  job="${BUILD_BUILDID}"
+  branch="$BUILD_SOURCEBRANCHNAME"
+  build_url=$(urlencode "${SYSTEM_TEAMFOUNDATIONSERVERURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}")
+elif [ "$CI" = "true" ] && [ "$BITBUCKET_BUILD_NUMBER" != "" ];
+then
+  say "$e==>$x Bitbucket detected."
+  # https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
+  service="bitbucket"
+  branch="$BITBUCKET_BRANCH"
+  build="$BITBUCKET_BUILD_NUMBER"
+  slug="$BITBUCKET_REPO_OWNER/$BITBUCKET_REPO_SLUG"
+  job="$BITBUCKET_BUILD_NUMBER"
+  pr="$BITBUCKET_PR_ID"
+  commit="$BITBUCKET_COMMIT"
+  # See https://jira.atlassian.com/browse/BCLOUD-19393
+  if [ "${#commit}" = 12 ];
+  then
+    commit=$(git rev-parse "$BITBUCKET_COMMIT")
+  fi
+elif [ "$CI" = "true" ] && [ "$BUDDY" = "true" ];
+then
+  say "$e==>$x Buddy CI detected."
+  # https://buddy.works/docs/pipelines/environment-variables
+  service="buddy"
+  branch="$BUDDY_EXECUTION_BRANCH"
+  build="$BUDDY_EXECUTION_ID"
+  build_url=$(urlencode "$BUDDY_EXECUTION_URL")
+  commit="$BUDDY_EXECUTION_REVISION"
+  pr="$BUDDY_EXECUTION_PULL_REQUEST_NO"
+  tag="$BUDDY_EXECUTION_TAG"
+  slug="$BUDDY_REPO_SLUG"
+
+elif [ "$CIRRUS_CI" != "" ];
+then
+  say "$e==>$x Cirrus CI detected."
+  # https://cirrus-ci.org/guide/writing-tasks/#environment-variables
+  service="cirrus-ci"
+  slug="$CIRRUS_REPO_FULL_NAME"
+  branch="$CIRRUS_BRANCH"
+  pr="$CIRRUS_PR"
+  commit="$CIRRUS_CHANGE_IN_REPO"
+  build="$CIRRUS_TASK_ID"
+  job="$CIRRUS_TASK_NAME"
+
+else
+  say "${r}x>${x} No CI provider detected."
+  say "    Testing inside Docker? ${b}http://docs.codecov.io/docs/testing-with-docker${x}"
+  say "    Testing with Tox? ${b}https://docs.codecov.io/docs/python#section-testing-with-tox${x}"
+
+fi
+
+say "    ${e}project root:${x} $git_root"
+
+# find branch, commit, repo from git command
+if [ "$GIT_BRANCH" != "" ];
+then
+  branch="$GIT_BRANCH"
+
+elif [ "$branch" = "" ];
+then
+  branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || hg branch 2>/dev/null || echo "")
+  if [ "$branch" = "HEAD" ];
+  then
+    branch=""
+  fi
+fi
+
+if [ "$commit_o" = "" ];
+then
+  # merge commit -> actual commit
+  mc=
+  if [ -n "$pr" ] && [ "$pr" != false ];
+  then
+    mc=$(git show --no-patch --format="%P" 2>/dev/null || echo "")
+  fi
+  if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
+  then
+    say "    Fixing merge commit SHA"
+    commit=$(echo "$mc" | cut -d' ' -f2)
+  elif [ "$GIT_COMMIT" != "" ];
+  then
+    commit="$GIT_COMMIT"
+  elif [ "$commit" = "" ];
+  then
+    commit=$(git log -1 --format="%H" 2>/dev/null || hg id -i --debug 2>/dev/null | tr -d '+' || echo "")
+  fi
+else
+  commit="$commit_o"
+fi
+
+if [ "$CODECOV_TOKEN" != "" ] && [ "$token" = "" ];
+then
+  say "${e}-->${x} token set from env"
+  token="$CODECOV_TOKEN"
+fi
+
+if [ "$CODECOV_URL" != "" ] && [ "$url_o" = "" ];
+then
+  say "${e}-->${x} url set from env"
+  url_o=$(echo "$CODECOV_URL" | sed -e 's/\/$//')
+fi
+
+if [ "$CODECOV_SLUG" != "" ];
+then
+  say "${e}-->${x} slug set from env"
+  slug_o="$CODECOV_SLUG"
+
+elif [ "$slug" = "" ];
+then
+  if [ "$remote_addr" = "" ];
+  then
+    remote_addr=$(git config --get remote.origin.url || hg paths default || echo '')
+  fi
+  if [ "$remote_addr" != "" ];
+  then
+    if echo "$remote_addr" | grep -q "//"; then
+      # https
+      slug=$(echo "$remote_addr" | cut -d / -f 4,5 | sed -e 's/\.git$//')
+    else
+      # ssh
+      slug=$(echo "$remote_addr" | cut -d : -f 2 | sed -e 's/\.git$//')
+    fi
+  fi
+  if [ "$slug" = "/" ];
+  then
+    slug=""
+  fi
+fi
+
+yaml=$(cd "$git_root" && \
+          git ls-files "*codecov.yml" "*codecov.yaml" 2>/dev/null \
+       || hg locate "*codecov.yml" "*codecov.yaml" 2>/dev/null \
+       || cd "$proj_root" && find . -maxdepth 1 -type f -name '*codecov.y*ml' 2>/dev/null \
+       || echo '')
+yaml=$(echo "$yaml" | head -1)
+
+if [ "$yaml" != "" ];
+then
+  say "    ${e}Yaml found at:${x} $yaml"
+  if [[ "$yaml" != /* ]]; then
+    # relative path for yaml file given, assume relative to the repo root
+    yaml="$git_root/$yaml"
+  fi
+  config=$(parse_yaml "$yaml" || echo '')
+
+  # TODO validate the yaml here
+
+  if [ "$(echo "$config" | grep 'codecov_token="')" != "" ] && [ "$token" = "" ];
+  then
+    say "${e}-->${x} token set from yaml"
+    token="$(echo "$config" | grep 'codecov_token="' | sed -e 's/codecov_token="//' | sed -e 's/"\.*//')"
+  fi
+
+  if [ "$(echo "$config" | grep 'codecov_url="')" != "" ] && [ "$url_o" = "" ];
+  then
+    say "${e}-->${x} url set from yaml"
+    url_o="$(echo "$config" | grep 'codecov_url="' | sed -e 's/codecov_url="//' | sed -e 's/"\.*//')"
+  fi
+
+  if [ "$(echo "$config" | grep 'codecov_slug="')" != "" ] && [ "$slug_o" = "" ];
+  then
+    say "${e}-->${x} slug set from yaml"
+    slug_o="$(echo "$config" | grep 'codecov_slug="' | sed -e 's/codecov_slug="//' | sed -e 's/"\.*//')"
+  fi
+else
+  say "    ${g}Yaml not found, that's ok! Learn more at${x} ${b}http://docs.codecov.io/docs/codecov-yaml${x}"
+fi
+
+if [ "$branch_o" != "" ];
+then
+  branch=$(urlencode "$branch_o")
+else
+  branch=$(urlencode "$branch")
+fi
+
+if [ "$slug_o" = "" ];
+then
+  urlencoded_slug=$(urlencode "$slug")
+else
+  urlencoded_slug=$(urlencode "$slug_o")
+fi
+
+query="branch=$branch\
+       &commit=$commit\
+       &build=$([ "$build_o" = "" ] && echo "$build" || echo "$build_o")\
+       &build_url=$build_url\
+       &name=$(urlencode "$name")\
+       &tag=$([ "$tag_o" = "" ] && echo "$tag" || echo "$tag_o")\
+       &slug=$urlencoded_slug\
+       &service=$service\
+       &flags=$flags\
+       &pr=$([ "$pr_o" = "" ] && echo "${pr##\#}" || echo "${pr_o##\#}")\
+       &job=$job\
+       &cmd_args=$(IFS=,; echo "${codecov_flags[*]}")"
+
+if [ -n "$project" ] && [ -n "$server_uri" ];
+then
+  query=$(echo "$query&project=$project&server_uri=$server_uri" | tr -d ' ')
+fi
+
+if [ "$parent" != "" ];
+then
+  query=$(echo "parent=$parent&$query" | tr -d ' ')
+fi
+
+if [ "$ft_search" = "1" ];
+then
+  # detect bower comoponents location
+  bower_components="bower_components"
+  bower_rc=$(cd "$git_root" && cat .bowerrc 2>/dev/null || echo "")
+  if [ "$bower_rc" != "" ];
+  then
+    bower_components=$(echo "$bower_rc" | tr -d '\n' | grep '"directory"' | cut -d'"' -f4 | sed -e 's/\/$//')
+    if [ "$bower_components" = "" ];
+    then
+      bower_components="bower_components"
+    fi
+  fi
+
+  # Swift Coverage
+  if [ "$ft_xcodellvm" = "1" ] && [ -d "$ddp" ];
+  then
+    say "${e}==>${x} Processing Xcode reports via llvm-cov"
+    say "    DerivedData folder: $ddp"
+    profdata_files=$(find "$ddp" -name '*.profdata' 2>/dev/null || echo '')
+    if [ "$profdata_files" != "" ];
+    then
+      # xcode via profdata
+      if [ "$xp" = "" ];
+      then
+        # xp=$(xcodebuild -showBuildSettings 2>/dev/null | grep -i "^\s*PRODUCT_NAME" | sed -e 's/.*= \(.*\)/\1/')
+        # say " ${e}->${x} Speed up Xcode processing by adding ${e}-J '$xp'${x}"
+        say "    ${g}hint${x} Speed up Swift processing by using use ${g}-J 'AppName'${x} (regexp accepted)"
+        say "    ${g}hint${x} This will remove Pods/ from your report. Also ${b}https://docs.codecov.io/docs/ignoring-paths${x}"
+      fi
+      while read -r profdata;
+      do
+        if [ "$profdata" != "" ];
+        then
+          swiftcov "$profdata" "$xp"
+        fi
+      done <<< "$profdata_files"
+    else
+      say "    ${e}->${x} No Swift coverage found"
+    fi
+
+    # Obj-C Gcov Coverage
+    if [ "$ft_gcov" = "1" ];
+    then
+      say "    ${e}->${x} Running $gcov_exe for Obj-C"
+      if [ "$ft_gcovout" = "0" ];
+      then
+        # suppress gcov output
+        bash -c "find $ddp -type f -name '*.gcda' $gcov_include $gcov_ignore -exec $gcov_exe -p $gcov_arg {} +" >/dev/null 2>&1 || true
+      else
+        bash -c "find $ddp -type f -name '*.gcda' $gcov_include $gcov_ignore -exec $gcov_exe -p $gcov_arg {} +" || true
+      fi
+    fi
+  fi
+
+  if [ "$ft_xcodeplist" = "1" ] && [ -d "$ddp" ];
+  then
+    say "${e}==>${x} Processing Xcode plists"
+    plists_files=$(find "$ddp" -name '*.xccoverage' 2>/dev/null || echo '')
+    if [ "$plists_files" != "" ];
+    then
+      while read -r plist;
+      do
+        if [ "$plist" != "" ];
+        then
+          say "    ${g}Found${x} plist file at $plist"
+          plutil -convert xml1 -o "$(basename "$plist").plist" -- "$plist"
+        fi
+      done <<< "$plists_files"
+    fi
+  fi
+
+  # Gcov Coverage
+  if [ "$ft_gcov" = "1" ];
+  then
+    say "${e}==>${x} Running $gcov_exe in $proj_root ${e}(disable via -X gcov)${x}"
+    if [ "$ft_gcovout" = "0" ];
+    then
+      # suppress gcov output
+      bash -c "find $proj_root -type f -name '*.gcno' $gcov_include $gcov_ignore -exec $gcov_exe -pb $gcov_arg {} +" >/dev/null 2>&1 || true
+    else
+      bash -c "find $proj_root -type f -name '*.gcno' $gcov_include $gcov_ignore -exec $gcov_exe -pb $gcov_arg {} +" || true
+    fi
+  else
+    say "${e}==>${x} gcov disabled"
+  fi
+
+  # Python Coverage
+  if [ "$ft_coveragepy" = "1" ];
+  then
+    if [ ! -f coverage.xml ];
+    then
+      if command -v coverage >/dev/null 2>&1;
+      then
+        say "${e}==>${x} Python coveragepy exists ${e}disable via -X coveragepy${x}"
+
+        dotcoverage=$(find "$git_root" -name '.coverage' -or -name '.coverage.*' | head -1 || echo '')
+        if [ "$dotcoverage" != "" ];
+        then
+          cd "$(dirname "$dotcoverage")"
+          if [ ! -f .coverage ];
+          then
+            say "    ${e}->${x} Running coverage combine"
+            coverage combine -a
+          fi
+          say "    ${e}->${x} Running coverage xml"
+          if [ "$(coverage xml -i)" != "No data to report." ];
+          then
+            files="$files
+$PWD/coverage.xml"
+          else
+            say "    ${r}No data to report.${x}"
+          fi
+          cd "$proj_root"
+        else
+          say "    ${r}No .coverage file found.${x}"
+        fi
+      else
+        say "${e}==>${x} Python coveragepy not found"
+      fi
+    fi
+  else
+    say "${e}==>${x} Python coveragepy disabled"
+  fi
+
+  if [ "$search_in_o" != "" ];
+  then
+    # location override
+    search_in="$search_in_o"
+  fi
+
+  say "$e==>$x Searching for coverage reports in:"
+  for _path in $search_in
+  do
+    say "    ${g}+${x} $_path"
+  done
+
+  patterns="find $search_in \( \
+                        -name vendor \
+                        -or -name htmlcov \
+                        -or -name virtualenv \
+                        -or -name js/generated/coverage \
+                        -or -name .virtualenv \
+                        -or -name virtualenvs \
+                        -or -name .virtualenvs \
+                        -or -name .env \
+                        -or -name .envs \
+                        -or -name env \
+                        -or -name .yarn-cache \
+                        -or -name envs \
+                        -or -name .venv \
+                        -or -name .venvs \
+                        -or -name venv \
+                        -or -name venvs \
+                        -or -name .git \
+                        -or -name .hg \
+                        -or -name .tox \
+                        -or -name __pycache__ \
+                        -or -name '.egg-info*' \
+                        -or -name '$bower_components' \
+                        -or -name node_modules \
+                        -or -name 'conftest_*.c.gcov' \
+                    \) -prune -or \
+                    -type f \( -name '*coverage*.*' \
+                     -or -name '*.clover' \
+                     -or -name '*.codecov.*' \
+                     -or -name '*.gcov' \
+                     -or -name '*.lcov' \
+                     -or -name '*.lst' \
+                     -or -name 'clover.xml' \
+                     -or -name 'cobertura.xml' \
+                     -or -name 'codecov.*' \
+                     -or -name 'cover.out' \
+                     -or -name 'coverage-final.json' \
+                     -or -name 'excoveralls.json' \
+                     -or -name 'gcov.info' \
+                     -or -name 'jacoco*.xml' \
+                     -or -name '*Jacoco*.xml' \
+                     -or -name 'lcov.dat' \
+                     -or -name 'lcov.info' \
+                     -or -name 'luacov.report.out' \
+                     -or -name 'naxsi.info' \
+                     -or -name 'nosetests.xml' \
+                     -or -name 'report.xml' \
+                     $include_cov \) \
+                    $exclude_cov \
+                    -not -name '*.am' \
+                    -not -name '*.bash' \
+                    -not -name '*.bat' \
+                    -not -name '*.bw' \
+                    -not -name '*.cfg' \
+                    -not -name '*.class' \
+                    -not -name '*.cmake' \
+                    -not -name '*.cmake' \
+                    -not -name '*.conf' \
+                    -not -name '*.coverage' \
+                    -not -name '*.cp' \
+                    -not -name '*.cpp' \
+                    -not -name '*.crt' \
+                    -not -name '*.css' \
+                    -not -name '*.csv' \
+                    -not -name '*.csv' \
+                    -not -name '*.data' \
+                    -not -name '*.db' \
+                    -not -name '*.dox' \
+                    -not -name '*.ec' \
+                    -not -name '*.ec' \
+                    -not -name '*.egg' \
+                    -not -name '*.el' \
+                    -not -name '*.env' \
+                    -not -name '*.erb' \
+                    -not -name '*.exe' \
+                    -not -name '*.ftl' \
+                    -not -name '*.gif' \
+                    -not -name '*.gradle' \
+                    -not -name '*.gz' \
+                    -not -name '*.h' \
+                    -not -name '*.html' \
+                    -not -name '*.in' \
+                    -not -name '*.jade' \
+                    -not -name '*.jar*' \
+                    -not -name '*.jpeg' \
+                    -not -name '*.jpg' \
+                    -not -name '*.js' \
+                    -not -name '*.less' \
+                    -not -name '*.log' \
+                    -not -name '*.m4' \
+                    -not -name '*.mak*' \
+                    -not -name '*.md' \
+                    -not -name '*.o' \
+                    -not -name '*.p12' \
+                    -not -name '*.pem' \
+                    -not -name '*.png' \
+                    -not -name '*.pom*' \
+                    -not -name '*.profdata' \
+                    -not -name '*.proto' \
+                    -not -name '*.ps1' \
+                    -not -name '*.pth' \
+                    -not -name '*.py' \
+                    -not -name '*.pyc' \
+                    -not -name '*.pyo' \
+                    -not -name '*.rb' \
+                    -not -name '*.rsp' \
+                    -not -name '*.rst' \
+                    -not -name '*.ru' \
+                    -not -name '*.sbt' \
+                    -not -name '*.scss' \
+                    -not -name '*.scss' \
+                    -not -name '*.serialized' \
+                    -not -name '*.sh' \
+                    -not -name '*.snapshot' \
+                    -not -name '*.sql' \
+                    -not -name '*.svg' \
+                    -not -name '*.tar.tz' \
+                    -not -name '*.template' \
+                    -not -name '*.whl' \
+                    -not -name '*.xcconfig' \
+                    -not -name '*.xcoverage.*' \
+                    -not -name '*/classycle/report.xml' \
+                    -not -name '*codecov.yml' \
+                    -not -name '*~' \
+                    -not -name '.*coveragerc' \
+                    -not -name '.coverage*' \
+                    -not -name 'coverage-summary.json' \
+                    -not -name 'createdFiles.lst' \
+                    -not -name 'fullLocaleNames.lst' \
+                    -not -name 'include.lst' \
+                    -not -name 'inputFiles.lst' \
+                    -not -name 'phpunit-code-coverage.xml' \
+                    -not -name 'phpunit-coverage.xml' \
+                    -not -name 'remapInstanbul.coverage*.json' \
+                    -not -name 'scoverage.measurements.*' \
+                    -not -name 'test_*_coverage.txt' \
+                    -not -name 'testrunner-coverage*' \
+                    -print 2>/dev/null"
+  files=$(eval "$patterns" || echo '')
+
+elif [ "$include_cov" != "" ];
+then
+  files=$(eval "find $search_in -type f \( ${include_cov:5} \)$exclude_cov 2>/dev/null" || echo '')
+fi
+
+num_of_files=$(echo "$files" | wc -l | tr -d ' ')
+if [ "$num_of_files" != '' ] && [ "$files" != '' ];
+then
+  say "    ${e}->${x} Found $num_of_files reports"
+fi
+
+# no files found
+if [ "$files" = "" ];
+then
+  say "${r}-->${x} No coverage report found."
+  say "    Please visit ${b}http://docs.codecov.io/docs/supported-languages${x}"
+  exit ${exit_with};
+fi
+
+if [ "$ft_network" == "1" ];
+then
+  say "${e}==>${x} Detecting git/mercurial file structure"
+  network=$(cd "$git_root" && git ls-files $git_ls_files_recurse_submodules_o 2>/dev/null || hg locate 2>/dev/null || echo "")
+  if [ "$network" = "" ];
+  then
+    network=$(find "$git_root" \( \
+                   -name virtualenv \
+                   -name .virtualenv \
+                   -name virtualenvs \
+                   -name .virtualenvs \
+                   -name '*.png' \
+                   -name '*.gif' \
+                   -name '*.jpg' \
+                   -name '*.jpeg' \
+                   -name '*.md' \
+                   -name .env \
+                   -name .envs \
+                   -name env \
+                   -name envs \
+                   -name .venv \
+                   -name .venvs \
+                   -name venv \
+                   -name venvs \
+                   -name .git \
+                   -name .egg-info \
+                   -name shunit2-2.1.6 \
+                   -name vendor \
+                   -name __pycache__ \
+                   -name node_modules \
+                   -path "*/$bower_components/*" \
+                   -path '*/target/delombok/*' \
+                   -path '*/build/lib/*' \
+                   -path '*/js/generated/coverage/*' \
+                    \) -prune -or \
+                    -type f -print 2>/dev/null || echo '')
+  fi
+
+  if [ "$prefix_o" != "" ];
+  then
+      network=$(echo "$network" | awk "{print \"$prefix_o/\"\$0}")
+  fi
+fi
+
+upload_file=$(mktemp /tmp/codecov.XXXXXX)
+adjustments_file=$(mktemp /tmp/codecov.adjustments.XXXXXX)
+
+cleanup() {
+    rm -f "$upload_file" "$adjustments_file" "$upload_file.gz"
+}
+
+trap cleanup INT ABRT TERM
+
+if [ "$env" != "" ];
+then
+  inc_env=""
+  say "${e}==>${x} Appending build variables"
+  for varname in $(echo "$env" | tr ',' ' ')
+  do
+    if [ "$varname" != "" ];
+    then
+      say "    ${g}+${x} $varname"
+      inc_env="${inc_env}${varname}=$(eval echo "\$${varname}")
+"
+    fi
+  done
+
+echo "$inc_env<<<<<< ENV" >> "$upload_file"
+fi
+
+# Append git file list
+# write discovered yaml location
+echo "$yaml" >> "$upload_file"
+if [ "$ft_network" == "1" ];
+then
+  i="woff|eot|otf"  # fonts
+  i="$i|gif|png|jpg|jpeg|psd"  # images
+  i="$i|ptt|pptx|numbers|pages|md|txt|xlsx|docx|doc|pdf|csv"  # docs
+  i="$i|yml|yaml|.gitignore"  # supporting docs
+
+  if [ "$ft_html" != "1" ];
+  then
+    i="$i|html"
+  fi
+
+  echo "$network" | grep -vwE "($i)$" >> "$upload_file"
+fi
+echo "<<<<<< network" >> "$upload_file"
+
+fr=0
+say "${e}==>${x} Reading reports"
+while IFS='' read -r file;
+do
+  # read the coverage file
+  if [ "$(echo "$file" | tr -d ' ')" != '' ];
+  then
+    if [ -f "$file" ];
+    then
+      report_len=$(wc -c < "$file")
+      if [ "$report_len" -ne 0 ];
+      then
+        say "    ${g}+${x} $file ${e}bytes=$(echo "$report_len" | tr -d ' ')${x}"
+        # append to to upload
+        _filename=$(basename "$file")
+        if [ "${_filename##*.}" = 'gcov' ];
+        then
+          {
+            echo "# path=$(echo "$file.reduced" | sed "s|^$git_root/||")";
+            # get file name
+            head -1 "$file";
+          } >> "$upload_file"
+          # 1. remove source code
+          # 2. remove ending bracket lines
+          # 3. remove whitespace
+          # 4. remove contextual lines
+          # 5. remove function names
+          awk -F': *' '{print $1":"$2":"}' "$file" \
+            | sed '\/: *} *$/d' \
+            | sed 's/^ *//' \
+            | sed '/^-/d' \
+            | sed 's/^function.*/func/' >> "$upload_file"
+        else
+          {
+            echo "# path=${file//^$git_root/||}";
+            cat "$file";
+          } >> "$upload_file"
+        fi
+        echo "<<<<<< EOF" >> "$upload_file"
+        fr=1
+        if [ "$clean" = "1" ];
+        then
+          rm "$file"
+        fi
+      else
+        say "    ${r}-${x} Skipping empty file $file"
+      fi
+    else
+      say "    ${r}-${x} file not found at $file"
+    fi
+  fi
+done <<< "$(echo -e "$files")"
+
+if [ "$fr" = "0" ];
+then
+  say "${r}-->${x} No coverage data found."
+  say "    Please visit ${b}http://docs.codecov.io/docs/supported-languages${x}"
+  say "    search for your projects language to learn how to collect reports."
+  exit ${exit_with};
+fi
+
+if [ "$ft_fix" = "1" ];
+then
+  say "${e}==>${x} Appending adjustments"
+  say "    ${b}https://docs.codecov.io/docs/fixing-reports${x}"
+
+  empty_line='^[[:space:]]*$'
+  # //
+  syntax_comment='^[[:space:]]*//.*'
+  # /* or */
+  syntax_comment_block='^[[:space:]]*(\/\*|\*\/)[[:space:]]*$'
+  # { or }
+  syntax_bracket='^[[:space:]]*[\{\}][[:space:]]*(//.*)?$'
+  # [ or ]
+  syntax_list='^[[:space:]]*[][][[:space:]]*(//.*)?$'
+  # func ... {
+  syntax_go_func='^[[:space:]]*[func].*[\{][[:space:]]*$'
+
+  # shellcheck disable=SC2089
+  skip_dirs="-not -path '*/$bower_components/*' \
+             -not -path '*/node_modules/*'"
+
+  cut_and_join() {
+    awk 'BEGIN { FS=":" }
+         $3 ~ /\/\*/ || $3 ~ /\*\// { print $0 ; next }
+         $1!=key { if (key!="") print out ; key=$1 ; out=$1":"$2 ; next }
+         { out=out","$2 }
+         END { print out }' 2>/dev/null
+  }
+
+  if echo "$network" | grep -m1 '.kt$' 1>/dev/null;
+  then
+    # skip brackets and comments
+    cd "$git_root" && \
+      find . -type f \
+             -name '*.kt' \
+             -exec \
+      grep -nIHE -e "$syntax_bracket" \
+                 -e "$syntax_comment_block" {} \; \
+      | cut_and_join \
+      >> "$adjustments_file" \
+      || echo ''
+
+    # last line in file
+    cd "$git_root" && \
+      find . -type f \
+             -name '*.kt' -exec \
+      wc -l {} \; \
+      | while read -r l; do echo "EOF: $l"; done \
+      2>/dev/null \
+      >> "$adjustments_file" \
+      || echo ''
+  fi
+
+  if echo "$network" | grep -m1 '.go$' 1>/dev/null;
+  then
+    # skip empty lines, comments, and brackets
+    cd "$git_root" && \
+      find . -type f \
+             -not -path '*/vendor/*' \
+             -not -path '*/caches/*' \
+             -name '*.go' \
+             -exec \
+      grep -nIHE \
+           -e "$empty_line" \
+           -e "$syntax_comment" \
+           -e "$syntax_comment_block" \
+           -e "$syntax_bracket" \
+           -e "$syntax_go_func" \
+           {} \; \
+      | cut_and_join \
+      >> "$adjustments_file" \
+      || echo ''
+  fi
+
+  if echo "$network" | grep -m1 '.dart$' 1>/dev/null;
+  then
+    # skip brackets
+    cd "$git_root" && \
+      find . -type f \
+             -name '*.dart' \
+             -exec \
+      grep -nIHE \
+           -e "$syntax_bracket" \
+           {} \; \
+      | cut_and_join \
+      >> "$adjustments_file" \
+      || echo ''
+  fi
+
+  if echo "$network" | grep -m1 '.php$' 1>/dev/null;
+  then
+    # skip empty lines, comments, and brackets
+    cd "$git_root" && \
+      find . -type f \
+             -not -path "*/vendor/*" \
+             -name '*.php' \
+             -exec \
+      grep -nIHE \
+           -e "$syntax_list" \
+           -e "$syntax_bracket" \
+           -e '^[[:space:]]*\);[[:space:]]*(//.*)?$' \
+           {} \; \
+      | cut_and_join \
+      >> "$adjustments_file" \
+      || echo ''
+  fi
+
+  if echo "$network" | grep -m1 '\(.cpp\|.h\|.cxx\|.c\|.hpp\|.m\|.swift\)$' 1>/dev/null;
+  then
+    # skip brackets
+    # shellcheck disable=SC2086,SC2090
+    cd "$git_root" && \
+      find . -type f \
+             $skip_dirs \
+         \( \
+           -name '*.h' \
+           -or -name '*.cpp' \
+           -or -name '*.cxx' \
+           -or -name '*.m' \
+           -or -name '*.c' \
+           -or -name '*.hpp' \
+           -or -name '*.swift' \
+         \) -exec \
+      grep -nIHE \
+           -e "$empty_line" \
+           -e "$syntax_bracket" \
+           -e '// LCOV_EXCL' \
+           {} \; \
+      | cut_and_join \
+      >> "$adjustments_file" \
+      || echo ''
+
+    # skip brackets
+    # shellcheck disable=SC2086,SC2090
+    cd "$git_root" && \
+      find . -type f \
+             $skip_dirs \
+         \( \
+           -name '*.h' \
+           -or -name '*.cpp' \
+           -or -name '*.cxx' \
+           -or -name '*.m' \
+           -or -name '*.c' \
+           -or -name '*.hpp' \
+           -or -name '*.swift' \
+         \) -exec \
+      grep -nIH '// LCOV_EXCL' \
+           {} \; \
+      >> "$adjustments_file" \
+      || echo ''
+
+  fi
+
+  found=$(< "$adjustments_file" tr -d ' ')
+
+  if [ "$found" != "" ];
+  then
+    say "    ${g}+${x} Found adjustments"
+    {
+      echo "# path=fixes";
+      cat "$adjustments_file";
+      echo "<<<<<< EOF";
+    } >> "$upload_file"
+    rm -rf "$adjustments_file"
+  else
+    say "    ${e}->${x} No adjustments found"
+  fi
+fi
+
+if [ "$url_o" != "" ];
+then
+  url="$url_o"
+fi
+
+if [ "$dump" != "0" ];
+then
+  # trim whitespace from query
+  say "    ${e}->${x} Dumping upload file (no upload)"
+  echo "$url/upload/v4?$(echo "package=bash-$VERSION&token=$token&$query" | tr -d ' ')"
+  cat "$upload_file"
+else
+  if [ "$save_to" != "" ];
+  then
+    say "${e}==>${x} Copying upload file to ${save_to}"
+    cp "$upload_file" "$save_to"
+  fi
+
+  say "${e}==>${x} Gzipping contents"
+  gzip -nf9 "$upload_file"
+
+  query=$(echo "${query}" | tr -d ' ')
+  say "${e}==>${x} Uploading reports"
+  say "    ${e}url:${x} $url"
+  say "    ${e}query:${x} $query"
+
+  # Full query without token (to display on terminal output)
+  queryNoToken=$(echo "package=bash-$VERSION&token=secret&$query" | tr -d ' ')
+  # now add token to query
+  query=$(echo "package=bash-$VERSION&token=$token&$query" | tr -d ' ')
+
+  if [ "$ft_s3" = "1" ];
+  then
+    say "${e}->${x}  Pinging Codecov"
+    say "$url/upload/v4?$queryNoToken"
+    # shellcheck disable=SC2086,2090
+    res=$(curl $curl_s -X POST $curlargs $cacert \
+          --retry 5 --retry-delay 2 --connect-timeout 2 \
+          -H 'X-Reduced-Redundancy: false' \
+          -H 'X-Content-Type: application/x-gzip' \
+          "$url/upload/v4?$query" || true)
+    # a good reply is "https://codecov.io" + "\n" + "https://storage.googleapis.com/codecov/..."
+    status=$(echo "$res" | head -1 | grep 'HTTP ' | cut -d' ' -f2)
+    if [ "$status" = "" ] && [ "$res" != "" ];
+    then
+      s3target=$(echo "$res" | sed -n 2p)
+      say "${e}->${x}  Uploading to"
+      say "${s3target}"
+
+      # shellcheck disable=SC2086
+      s3=$(curl -fiX PUT $curlawsargs \
+          --data-binary @"$upload_file.gz" \
+          -H 'Content-Type: application/x-gzip' \
+          -H 'Content-Encoding: gzip' \
+          "$s3target" || true)
+
+      if [ "$s3" != "" ];
+      then
+        say "    ${g}->${x} View reports at ${b}$(echo "$res" | sed -n 1p)${x}"
+        exit 0
+      else
+        say "    ${r}X>${x} Failed to upload"
+      fi
+    elif [ "$status" = "400" ];
+    then
+        # 400 Error
+        say "${g}${res}${x}"
+        exit ${exit_with}
+    fi
+  fi
+
+  say "${e}==>${x} Uploading to Codecov"
+
+  # shellcheck disable=SC2086,2090
+  res=$(curl -X POST $curlargs $cacert \
+        --data-binary @"$upload_file.gz" \
+        --retry 5 --retry-delay 2 --connect-timeout 2 \
+        -H 'Content-Type: text/plain' \
+        -H 'Content-Encoding: gzip' \
+        -H 'X-Content-Encoding: gzip' \
+        -H 'Accept: text/plain' \
+        "$url/upload/v2?$query&attempt=$i" || echo 'HTTP 500')
+  # HTTP 200
+  # http://....
+  status=$(echo "$res" | head -1 | cut -d' ' -f2)
+  if [ "$status" = "" ] || [ "$status" = "200" ];
+  then
+    say "    View reports at ${b}$(echo "$res" | head -2 | tail -1)${x}"
+    exit 0
+  else
+    say "    ${g}${res}${x}"
+    exit ${exit_with}
+  fi
+
+  say "    ${r}X> Failed to upload coverage reports${x}"
+fi
+
+exit ${exit_with}
diff --git a/scripts/codecov.sh b/scripts/codecov.sh
index 837c0770b611..2b73d00ae8dc 100644
--- a/scripts/codecov.sh
+++ b/scripts/codecov.sh
@@ -10,5 +10,5 @@ done
 
 wget -O - -q "https://codecov.io/bash" > .codecov
 chmod +x .codecov
-./.codecov -t $CODE_COV_TOKEN
+./.codecov -t $CODECOV_TOKEN
 echo "Uploaded code coverage"
\ No newline at end of file

From bd8483699b7b606f27d0a220ecba0a022ebda00e Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 15:12:01 -0500
Subject: [PATCH 018/118] wip

---
 .circleci/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9db47467b35..35e5472b0904 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -178,8 +178,6 @@ jobs:
     executor: test-executor
     description: Publish documentation to GitHub pages
     steps:
-      - build_setup
-      - restore_cargo_package_cache
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
@@ -196,6 +194,12 @@ jobs:
     steps:
       # Need to use nightly for this.
       - build_setup
+      - run:
+          name: Nightly Build
+          command: |
+              rustup run nightly rustc --version --verbose
+              rustup run nightly cargo --version --verbose
+              rustup run nightly cargo build
       - install-grcov
       - run: bash ./automation/emit_coverage_info.sh
       - run:

From 0b8c6c603c6c5f4e9dccab534674dbf0eacc2a47 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 15:18:42 -0500
Subject: [PATCH 019/118] wip

---
 .circleci/config.yml | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35e5472b0904..c21664e9b86e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,6 +124,22 @@ commands:
       - env_setup
       - install_deps
 jobs:
+  cov:
+    machine: true
+    steps:
+      - checkout
+      - run:
+          name: Pull xd009642/tarpaulin
+          command: docker pull xd009642/tarpaulin:latest
+      - run:
+          name: Generate report
+          command: >
+            docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
+            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
+            --out Xml --all-features
+      - run:
+          name: Upload
+          command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   prefetch-crates:
     executor: test-executor
     description: Prefetch cargo crates for subsequent jobs.
@@ -149,7 +165,6 @@ jobs:
   test:
     executor: test-executor
     description: Run Rust tests
-    parallelism: 4
     steps:
       - build_setup
       - restore_cargo_package_cache
@@ -178,6 +193,8 @@ jobs:
     executor: test-executor
     description: Publish documentation to GitHub pages
     steps:
+      - build_setup
+      - restore_cargo_package_cache
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
@@ -187,27 +204,6 @@ jobs:
       - run:
           name: Publish Docs
           command: bash ./scripts/build-rust-docs.sh
-  cov:
-    docker:
-      - image: circleci/rust:latest
-    resource_class: medium
-    steps:
-      # Need to use nightly for this.
-      - build_setup
-      - run:
-          name: Nightly Build
-          command: |
-              rustup run nightly rustc --version --verbose
-              rustup run nightly cargo --version --verbose
-              rustup run nightly cargo build
-      - install-grcov
-      - run: bash ./automation/emit_coverage_info.sh
-      - run:
-          name: Compile coverage
-          command: grcov ./target/debug/ -s . -t lcov --llvm --ignore-not-existing --ignore "target/*" --ignore "/*" -o lcov.info
-      - run:
-          name: Upload to codecov.io
-          command: bash <(curl -s https://codecov.io/bash) -f lcov.info
 
 workflows:
   setup_test:

From 26bbb5ab0af92bb1f1c4a9989baec36c5a0c1ed7 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 15:49:40 -0500
Subject: [PATCH 020/118] wip

---
 .circleci/config.yml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c21664e9b86e..414e409b1504 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,24 +96,6 @@ commands:
           command: |
             ls -all $HOME/.cargo
             du -ssh $HOME/.cargo
-  install-grcov:
-    steps:
-      - run:
-          name: Install grcov
-          command: |
-            GRCOV_VERSION=v0.5.15
-            GRCOV_ARCHIVE=grcov-linux-x86_64.tar.bz2
-            GRCOV_SHA256=1182739b2b1df31dee74ed3533330001f9da921cf169bd8da4ec0386e4243ad0
-            GRCOV_URL="https://github.com/mozilla/grcov/releases/download/${GRCOV_VERSION}/${GRCOV_ARCHIVE}"
-            curl -sfSL --retry 5 --retry-delay 10 -O "${GRCOV_URL}"
-            echo "${GRCOV_SHA256} *${GRCOV_ARCHIVE}" | shasum -a 256 -c -
-            # Just install `grcov` to ~/.bin
-            mkdir -p "$HOME/.bin"
-            tar jxf "${GRCOV_ARCHIVE}" -C "$HOME/.bin"
-            echo 'export PATH="$HOME/.bin:$PATH"' >> $BASH_ENV
-      # Run in a different shell to source $BASH_ENV
-      - run: |
-          grcov --version
   build_setup:
     description: Sets up environment for future jobs
     steps:
@@ -135,7 +117,7 @@ jobs:
           name: Generate report
           command: >
             docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
+            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --tests --ciserver circle-ci
             --out Xml --all-features
       - run:
           name: Upload

From cbb37f879d7e7abfbcd7a22a57f5691d0d734e4f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:04:02 -0500
Subject: [PATCH 021/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 414e409b1504..998be3fa08b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,7 @@ jobs:
           name: Generate report
           command: >
             docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --tests --ciserver circle-ci
+            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --all-features --ciserver circle-ci
             --out Xml --all-features
       - run:
           name: Upload

From 17fc52244ab680215125859b02e667018aadd27a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:05:23 -0500
Subject: [PATCH 022/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 998be3fa08b1..bce1b55fd492 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,7 @@ jobs:
           name: Generate report
           command: >
             docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --all-features --ciserver circle-ci
+            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
             --out Xml --all-features
       - run:
           name: Upload

From e912bdb4bd28229028acd74533c808866e62df00 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:25:24 -0500
Subject: [PATCH 023/118] wip

---
 .github/workflows/ci-rust.yml | 97 ++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 86bb8face340..efce76a44846 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -9,9 +9,32 @@ on:
       - main
 
 jobs:
+  cov:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features --no-fail-fast
+        env:
+          CARGO_INCREMENTAL: '0'
+          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+      - id: coverage
+      - uses: actions-rs/grcov@v0.1
+      - name: Coveralls upload
+          uses: coverallsapp/github-action@master
+          with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            path-to-lcov: ${{ steps.coverage.outputs.report }}
   test:
     name: test
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
@@ -47,7 +70,7 @@ jobs:
 
   fmt:
     name: rustfmt
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
@@ -70,7 +93,7 @@ jobs:
 
   clippy:
     name: clippy
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -106,37 +129,37 @@ jobs:
           command: check
           args: -p forest
 
-  publish_docs:
-    if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
-    name: Publish Documentation
-    needs: [clippy, test]
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: "recursive"
-
-      - name: Install Rust
-        run: rustup update beta && rustup default beta
-
-      - name: Update apt repositories
-        run: sudo apt update
-
-      - name: Install OpenCL
-        run: sudo apt install ocl-icd-opencl-dev
-
-      # - name: Install Protoc
-      #   uses: arduino/setup-protoc@master
-      #   with:
-      #     version: "3.9.1"
-
-      - name: Build documentation
-        run: cargo doc --no-deps --all-features
-      - name: Publish documentation
-        run: |
-          cd target/doc
-          git init
-          echo '<meta http-equiv="refresh" content="0; url=https://chainsafe.github.io/forest/forest_vm/index.html">' > index.html
-          git add .
-          git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
-          git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
+  # publish_docs:
+  #   if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
+  #   name: Publish Documentation
+  #   needs: [clippy, test]
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #         submodules: "recursive"
+
+  #     - name: Install Rust
+  #       run: rustup update beta && rustup default beta
+
+  #     - name: Update apt repositories
+  #       run: sudo apt update
+
+  #     - name: Install OpenCL
+  #       run: sudo apt install ocl-icd-opencl-dev
+
+  #     # - name: Install Protoc
+  #     #   uses: arduino/setup-protoc@master
+  #     #   with:
+  #     #     version: "3.9.1"
+
+  #     - name: Build documentation
+  #       run: cargo doc --no-deps --all-features
+  #     - name: Publish documentation
+  #       run: |
+  #         cd target/doc
+  #         git init
+  #         echo '<meta http-equiv="refresh" content="0; url=https://chainsafe.github.io/forest/forest_vm/index.html">' > index.html
+  #         git add .
+  #         git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+  #         git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages

From dccc042837fb4e8464b7bcce4b6d24fe7de28d88 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:27:43 -0500
Subject: [PATCH 024/118] wip

---
 .github/workflows/ci-rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index efce76a44846..4b64f32ae229 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -3,10 +3,10 @@ name: Rust CI
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   cov:

From 17f7173c25b76c4ae1e7f3686dc495ca0521d6cc Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:29:30 -0500
Subject: [PATCH 025/118] wip

---
 .github/workflows/ci-rust.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 4b64f32ae229..b12892ec1e2e 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -6,7 +6,7 @@ on:
       - master
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   cov:
@@ -27,11 +27,6 @@ jobs:
           RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
       - id: coverage
       - uses: actions-rs/grcov@v0.1
-      - name: Coveralls upload
-          uses: coverallsapp/github-action@master
-          with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            path-to-lcov: ${{ steps.coverage.outputs.report }}
   test:
     name: test
     runs-on: ubuntu-latest

From 3adc4e1804b55f912c8387c9080985d56ddbfa59 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:32:02 -0500
Subject: [PATCH 026/118] wip

---
 .github/workflows/ci-rust.yml | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index b12892ec1e2e..92c7661f446b 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -10,23 +10,34 @@ on:
 
 jobs:
   cov:
+    name: Rust project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
+
+      - name: Run cargo-tarpaulin
+        uses: actions-rs/tarpaulin@v0.1
+        with:
+          version: '0.9.0'
+          args: '-- --test-threads 1'
+
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v1.0.2
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v1
         with:
-          command: test
-          args: --all-features --no-fail-fast
-        env:
-          CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-      - id: coverage
-      - uses: actions-rs/grcov@v0.1
+          name: code-coverage-report
+          path: cobertura.xml
   test:
     name: test
     runs-on: ubuntu-latest

From c54ebc3440ac7267b945e0a52f1629029df4efc1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:33:44 -0500
Subject: [PATCH 027/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 92c7661f446b..09fcec94c7b8 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -6,7 +6,7 @@ on:
       - master
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   cov:

From 84ae035e314190d3c1d0e140a223188106e7436f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:43:57 -0500
Subject: [PATCH 028/118] wip

---
 .github/workflows/grcov.yml | 73 +++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 .github/workflows/grcov.yml

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
new file mode 100644
index 000000000000..e8c484377511
--- /dev/null
+++ b/.github/workflows/grcov.yml
@@ -0,0 +1,73 @@
+
+on:
+    push:
+      branches:
+        - master
+    pull_request:
+      branches:
+        - master
+
+name: Code coverage with grcov
+
+jobs:
+  grcov:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          profile: minimal
+
+      - name: Execute tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all
+        env:
+          CARGO_INCREMENTAL: 0
+          RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
+
+      # Note that `actions-rs/grcov` Action can install `grcov` too,
+      # but can't use faster installation methods yet.
+      # As a temporary experiment `actions-rs/install` Action plugged in here.
+      # Consider **NOT** to copy that into your workflow,
+      # but use `actions-rs/grcov` only
+      - name: Pre-installing grcov
+        uses: actions-rs/install@v0.1
+        with:
+          crate: grcov
+          use-tool-cache: true
+
+      - name: Gather coverage data
+        id: coverage
+        uses: actions-rs/grcov@v0.1
+        with:
+          coveralls-token: ${{ secrets.COVERALLS_TOKEN }}
+
+      - name: Coveralls upload
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GIT_TOKEN }}
+          parallel: true
+          path-to-lcov: ${{ steps.coverage.outputs.report }}
+
+  grcov_finalize:
+    runs-on: ubuntu-latest
+    needs: grcov
+    steps:
+      - name: Coveralls finalization
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GIT_TOKEN }}
+          parallel-finished: true
\ No newline at end of file

From a614be767ab67389fe05df49eb48bfe62463fe8f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 16:50:41 -0500
Subject: [PATCH 029/118] wip

---
 .github/workflows/ci-rust.yml | 29 -----------------------------
 .github/workflows/grcov.yml   |  1 -
 2 files changed, 30 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 09fcec94c7b8..fe81a25aa947 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -9,35 +9,6 @@ on:
       - master
 
 jobs:
-  cov:
-    name: Rust project
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-
-      - name: Run cargo-tarpaulin
-        uses: actions-rs/tarpaulin@v0.1
-        with:
-          version: '0.9.0'
-          args: '-- --test-threads 1'
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1.0.2
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-
-      - name: Archive code coverage results
-        uses: actions/upload-artifact@v1
-        with:
-          name: code-coverage-report
-          path: cobertura.xml
   test:
     name: test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index e8c484377511..319f8380c68d 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -17,7 +17,6 @@ jobs:
         os:
           - ubuntu-latest
           - macOS-latest
-          - windows-latest
 
     steps:
       - uses: actions/checkout@v2

From ac0d172e6aedf2840736a775918d14f5d9a1014f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 17:02:57 -0500
Subject: [PATCH 030/118] wip

---
 .github/workflows/grcov.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 319f8380c68d..a5992141b47e 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macOS-latest
+        #   - macOS-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all
+          args: --all-features
         env:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"

From 5bf818c1a379224c430293fc927f791cf73fd9ed Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 17:04:52 -0500
Subject: [PATCH 031/118] wip

---
 .github/workflows/grcov.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index a5992141b47e..9de9579a9432 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -16,10 +16,18 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        #   - macOS-latest
+          - macOS-latest
 
     steps:
       - uses: actions/checkout@v2
+    
+      - name: Update apt repositories
+        run: sudo apt update
+
+      - name: Install apt packages
+        run: |
+            sudo apt install ocl-icd-opencl-dev clang llvm
+            sudo apt-get install -y libhwloc-dev
 
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

From 00119f366bf90d7276eab5c6caa65e6a82d9df51 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 17:06:19 -0500
Subject: [PATCH 032/118] wip

---
 .github/workflows/grcov.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 9de9579a9432..4f3ec8c34b83 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -16,19 +16,11 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macOS-latest
+        #   - macOS-latest
 
     steps:
       - uses: actions/checkout@v2
     
-      - name: Update apt repositories
-        run: sudo apt update
-
-      - name: Install apt packages
-        run: |
-            sudo apt install ocl-icd-opencl-dev clang llvm
-            sudo apt-get install -y libhwloc-dev
-
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:

From e127cb33c9b8f01b59159eb4f02b745db523df8f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 17:15:24 -0500
Subject: [PATCH 033/118] wip

---
 .github/workflows/grcov.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 4f3ec8c34b83..6d8699a7f406 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -20,6 +20,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Update apt repositories
+        run: sudo apt update
+
+      - name: Install apt packages
+        run: |
+            sudo apt install ocl-icd-opencl-dev
+            sudo apt-get install -y libhwloc-dev
     
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

From 5ceb5767143a6b44d99678790bc1246bdb356e5f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 17:30:07 -0500
Subject: [PATCH 034/118] wip

---
 .github/workflows/ci-rust.yml | 13 +++++++++++++
 .github/workflows/grcov.yml   | 14 +++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index fe81a25aa947..c3392065776c 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -9,6 +9,19 @@ on:
       - master
 
 jobs:
+  cov:
+    name: Code Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Push to coveralls.io
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+        run: |
+          cargo install cargo-tarpaulin
+          cargo tarpaulin --ciserver github-ci --coveralls $COVERALLS_TOKEN
   test:
     name: test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 6d8699a7f406..16df4b39b3ea 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -36,11 +36,15 @@ jobs:
           override: true
           profile: minimal
 
-      - name: Execute tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features
+      - name: Pull submodules
+        run: git submodule update --init
+
+      - name: Run all unit tests
+        run: make test
+
+      - name: Run test vectors
+        run: make run-vectors
+        
         env:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"

From 93b7409015f307e93c5a40ba30d91daa80c2ed49 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 18:14:50 -0500
Subject: [PATCH 035/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 .github/workflows/grcov.yml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index c3392065776c..1d007ad34707 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - name: Push to coveralls.io
         env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+          COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
         run: |
           cargo install cargo-tarpaulin
           cargo tarpaulin --ciserver github-ci --coveralls $COVERALLS_TOKEN
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 16df4b39b3ea..094cdf47d90f 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Install apt packages
         run: |
-            sudo apt install ocl-icd-opencl-dev
+            sudo apt install ocl-icd-opencl-dev libclang-dev
             sudo apt-get install -y libhwloc-dev
     
       - name: Install toolchain
@@ -44,7 +44,7 @@ jobs:
 
       - name: Run test vectors
         run: make run-vectors
-        
+
         env:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"

From 363c21652a19421626fd511a144f7abcaab0534a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 18:53:05 -0500
Subject: [PATCH 036/118] wip

---
 .github/workflows/ci-rust.yml | 13 +++++++------
 .github/workflows/grcov.yml   |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 1d007ad34707..3210157d32ff 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -16,12 +16,13 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Push to coveralls.io
-        env:
-          COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-        run: |
-          cargo install cargo-tarpaulin
-          cargo tarpaulin --ciserver github-ci --coveralls $COVERALLS_TOKEN
+    - name: Push to codecov.io
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      run: |
+        cargo install cargo-tarpaulin
+        cargo tarpaulin --out Xml
+        bash <(curl -s https://codecov.io/bash) -X gcov -t $CODECOV_TOKEN
   test:
     name: test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 094cdf47d90f..ba45fb050ae2 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -26,8 +26,8 @@ jobs:
 
       - name: Install apt packages
         run: |
-            sudo apt install ocl-icd-opencl-dev libclang-dev
-            sudo apt-get install -y libhwloc-dev
+            sudo apt install ocl-icd-opencl-dev
+            sudo apt-get install -y libhwloc-dev libclang-dev gcc
     
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
@@ -42,8 +42,8 @@ jobs:
       - name: Run all unit tests
         run: make test
 
-      - name: Run test vectors
-        run: make run-vectors
+    #   - name: Run test vectors
+    #     run: make run-vectors
 
         env:
           CARGO_INCREMENTAL: 0

From 3937c535321725d2c213431401b82507a0147865 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 19:12:23 -0500
Subject: [PATCH 037/118] wip

---
 .github/workflows/grcov.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index ba45fb050ae2..25063b7acda3 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Install apt packages
         run: |
             sudo apt install ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev libclang-dev gcc
+            sudo apt-get install -y libhwloc-dev libclang-dev
     
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

From 48642483a6e9ec1975385797995b6e6095406e32 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 19:13:27 -0500
Subject: [PATCH 038/118] wip

---
 .github/workflows/ci-rust.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 3210157d32ff..d1d52e8b9f50 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -16,13 +16,13 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-    - name: Push to codecov.io
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      run: |
-        cargo install cargo-tarpaulin
-        cargo tarpaulin --out Xml
-        bash <(curl -s https://codecov.io/bash) -X gcov -t $CODECOV_TOKEN
+      - name: Push to codecov.io
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: |
+          cargo install cargo-tarpaulin
+          cargo tarpaulin --out Xml
+          bash <(curl -s https://codecov.io/bash) -X gcov -t $CODECOV_TOKEN
   test:
     name: test
     runs-on: ubuntu-latest

From f4015cca09ec5516c4e3d90515e38bb8e3e21dd8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 19:28:08 -0500
Subject: [PATCH 039/118] wip

---
 .github/workflows/grcov.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 25063b7acda3..702a0b1c9c3f 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -26,8 +26,8 @@ jobs:
 
       - name: Install apt packages
         run: |
-            sudo apt install ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev libclang-dev
+            sudo apt install ocl-icd-opencl-dev make clang pkg-config libssl-dev libclang-dev
+            sudo apt-get install -y libhwloc-dev
     
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

From d1080f581e08482ea489939cc2d69a204130bf2d Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 19:51:57 -0500
Subject: [PATCH 040/118] wip

---
 .github/workflows/ci-rust.yml                 |    2 +-
 .github/workflows/grcov.yml                   |    4 +-
 kcov-38/.dockerignore                         |    2 +
 kcov-38/.gitignore                            |   13 +
 kcov-38/.gitmodules                           |    3 +
 kcov-38/.travis.yml                           |   47 +
 kcov-38/CMakeLists.txt                        |   50 +
 kcov-38/CONTRIBUTING.md                       |   12 +
 kcov-38/COPYING                               |  339 ++
 kcov-38/COPYING.externals                     |    3 +
 kcov-38/CPack.local.cmake                     |   29 +
 kcov-38/ChangeLog                             |  740 ++++
 kcov-38/Dockerfile                            |   40 +
 kcov-38/INSTALL.md                            |   94 +
 kcov-38/README                                |    1 +
 kcov-38/README.md                             |   96 +
 kcov-38/cmake/FindBfd.cmake                   |   85 +
 kcov-38/cmake/FindElfutils.cmake              |   77 +
 kcov-38/cmake/FindLibCRPCUT.cmake             |   59 +
 kcov-38/cmake/FindLibElf.cmake                |   68 +
 kcov-38/cmake/TargetArch.cmake                |  134 +
 kcov-38/data/amber.png                        |  Bin 0 -> 141 bytes
 kcov-38/data/bcov.css                         |   32 +
 kcov-38/data/glass.png                        |  Bin 0 -> 167 bytes
 kcov-38/data/index.html                       |   97 +
 kcov-38/data/js/handlebars.js                 | 3079 +++++++++++++++++
 kcov-38/data/js/jquery.min.js                 |    4 +
 kcov-38/data/js/jquery.tablesorter.min.js     |    5 +
 .../data/js/jquery.tablesorter.widgets.min.js |   17 +
 kcov-38/data/js/kcov.js                       |   78 +
 kcov-38/data/source-file.html                 |   71 +
 kcov-38/data/tablesorter-theme.css            |  221 ++
 kcov-38/debian/.gitignore                     |    3 +
 kcov-38/debian/README                         |    6 +
 kcov-38/debian/changelog                      |    5 +
 kcov-38/debian/compat                         |    1 +
 kcov-38/debian/control                        |   19 +
 kcov-38/debian/copyright                      |   34 +
 kcov-38/debian/kcov-docs.docs                 |    3 +
 kcov-38/debian/rules                          |   25 +
 kcov-38/debian/source/format                  |    1 +
 kcov-38/doc/CMakeLists.txt                    |    1 +
 kcov-38/doc/codecov.md                        |   17 +
 kcov-38/doc/coveralls.md                      |   11 +
 kcov-38/doc/design.txt                        |   78 +
 kcov-38/doc/full-system-instrumentation.md    |   35 +
 kcov-38/doc/gitlab.md                         |    8 +
 kcov-38/doc/jenkins.md                        |    6 +
 kcov-38/doc/kcov.1                            |  175 +
 kcov-38/doc/sonarqube.md                      |    5 +
 kcov-38/external/lldb/include/lldb/API/LLDB.h |   57 +
 .../lldb/include/lldb/API/SBAddress.h         |  152 +
 .../lldb/include/lldb/API/SBAttachInfo.h      |  149 +
 .../external/lldb/include/lldb/API/SBBlock.h  |  123 +
 .../lldb/include/lldb/API/SBBreakpoint.h      |  193 ++
 .../include/lldb/API/SBBreakpointLocation.h   |  114 +
 .../lldb/include/lldb/API/SBBroadcaster.h     |   97 +
 .../include/lldb/API/SBCommandInterpreter.h   |  318 ++
 .../include/lldb/API/SBCommandReturnObject.h  |  133 +
 .../lldb/include/lldb/API/SBCommunication.h   |  100 +
 .../lldb/include/lldb/API/SBCompileUnit.h     |  119 +
 .../external/lldb/include/lldb/API/SBData.h   |  181 +
 .../lldb/include/lldb/API/SBDebugger.h        |  363 ++
 .../lldb/include/lldb/API/SBDeclaration.h     |   89 +
 .../lldb/include/lldb/API/SBDefines.h         |  101 +
 .../external/lldb/include/lldb/API/SBError.h  |  108 +
 .../external/lldb/include/lldb/API/SBEvent.h  |  105 +
 .../include/lldb/API/SBExecutionContext.h     |   74 +
 .../include/lldb/API/SBExpressionOptions.h    |  135 +
 .../lldb/include/lldb/API/SBFileSpec.h        |  104 +
 .../lldb/include/lldb/API/SBFileSpecList.h    |   72 +
 .../external/lldb/include/lldb/API/SBFrame.h  |  237 ++
 .../lldb/include/lldb/API/SBFunction.h        |   96 +
 .../external/lldb/include/lldb/API/SBHostOS.h |   60 +
 .../lldb/include/lldb/API/SBInstruction.h     |   94 +
 .../lldb/include/lldb/API/SBInstructionList.h |   71 +
 .../lldb/include/lldb/API/SBLanguageRuntime.h |   29 +
 .../lldb/include/lldb/API/SBLaunchInfo.h      |  195 ++
 .../lldb/include/lldb/API/SBLineEntry.h       |   99 +
 .../lldb/include/lldb/API/SBListener.h        |  145 +
 .../external/lldb/include/lldb/API/SBModule.h |  359 ++
 .../lldb/include/lldb/API/SBModuleSpec.h      |  154 +
 .../lldb/include/lldb/API/SBPlatform.h        |  211 ++
 .../lldb/include/lldb/API/SBProcess.h         |  369 ++
 .../external/lldb/include/lldb/API/SBQueue.h  |   89 +
 .../lldb/include/lldb/API/SBQueueItem.h       |   57 +
 .../lldb/include/lldb/API/SBSection.h         |  116 +
 .../lldb/include/lldb/API/SBSourceManager.h   |   53 +
 .../external/lldb/include/lldb/API/SBStream.h |  114 +
 .../lldb/include/lldb/API/SBStringList.h      |   71 +
 .../external/lldb/include/lldb/API/SBSymbol.h |  109 +
 .../lldb/include/lldb/API/SBSymbolContext.h   |   94 +
 .../include/lldb/API/SBSymbolContextList.h    |   69 +
 .../external/lldb/include/lldb/API/SBTarget.h |  819 +++++
 .../external/lldb/include/lldb/API/SBThread.h |  259 ++
 .../include/lldb/API/SBThreadCollection.h     |   68 +
 .../lldb/include/lldb/API/SBThreadPlan.h      |  129 +
 .../external/lldb/include/lldb/API/SBType.h   |  333 ++
 .../lldb/include/lldb/API/SBTypeCategory.h    |  168 +
 .../lldb/include/lldb/API/SBTypeEnumMember.h  |   98 +
 .../lldb/include/lldb/API/SBTypeFilter.h      |   92 +
 .../lldb/include/lldb/API/SBTypeFormat.h      |  100 +
 .../include/lldb/API/SBTypeNameSpecifier.h    |   77 +
 .../lldb/include/lldb/API/SBTypeSummary.h     |  165 +
 .../lldb/include/lldb/API/SBTypeSynthetic.h   |  102 +
 .../lldb/include/lldb/API/SBUnixSignals.h     |   84 +
 .../external/lldb/include/lldb/API/SBValue.h  |  504 +++
 .../lldb/include/lldb/API/SBValueList.h       |   96 +
 .../include/lldb/API/SBVariablesOptions.h     |   98 +
 .../lldb/include/lldb/API/SBWatchpoint.h      |  104 +
 .../include/lldb/API/SystemInitializerFull.h  |   40 +
 .../lldb/include/lldb/Utility/SharingPtr.h    |  841 +++++
 .../external/lldb/include/lldb/lldb-defines.h |  153 +
 .../lldb/include/lldb/lldb-enumerations.h     | 1052 ++++++
 .../external/lldb/include/lldb/lldb-forward.h |  440 +++
 .../external/lldb/include/lldb/lldb-types.h   |  118 +
 .../lldb/include/lldb/lldb-versioning.h       | 1607 +++++++++
 kcov-38/src/CMakeLists.txt                    |  460 +++
 kcov-38/src/bin-to-c-source.py                |   36 +
 kcov-38/src/capabilities.cc                   |   49 +
 kcov-38/src/cmake_uninstall.cmake.in          |   21 +
 kcov-38/src/collector.cc                      |  198 ++
 kcov-38/src/configuration.cc                  |  809 +++++
 kcov-38/src/dummy-solib-handler.cc            |   20 +
 kcov-38/src/engine-factory.cc                 |   63 +
 kcov-38/src/engines/bash-engine.cc            |  845 +++++
 kcov-38/src/engines/bash-execve-redirector.c  |   87 +
 kcov-38/src/engines/bash-helper-debug-trap.sh |    5 +
 kcov-38/src/engines/bash-helper.sh            |    4 +
 kcov-38/src/engines/clang-coverage-engine.cc  |  268 ++
 kcov-38/src/engines/gcov-engine.cc            |  205 ++
 kcov-38/src/engines/kernel-engine.cc          |  189 +
 kcov-38/src/engines/lldb-engine.cc            |  486 +++
 kcov-38/src/engines/ptrace.cc                 |  471 +++
 kcov-38/src/engines/ptrace_freebsd.cc         |  184 +
 kcov-38/src/engines/ptrace_linux.cc           |  430 +++
 kcov-38/src/engines/ptrace_sys.hh             |   26 +
 kcov-38/src/engines/python-engine.cc          |  474 +++
 kcov-38/src/engines/python-helper.py          |  109 +
 kcov-38/src/engines/script-engine-base.hh     |  117 +
 kcov-38/src/engines/system-mode-binary-lib.cc |   86 +
 kcov-38/src/engines/system-mode-engine.cc     |  267 ++
 .../src/engines/system-mode-file-format.cc    |  125 +
 .../src/engines/system-mode-file-format.hh    |   86 +
 kcov-38/src/filter.cc                         |  362 ++
 kcov-38/src/gcov.cc                           |  409 +++
 kcov-38/src/include/capabilities.hh           |   52 +
 kcov-38/src/include/collector.hh              |   60 +
 kcov-38/src/include/configuration.hh          |  128 +
 kcov-38/src/include/disassembler.hh           |   48 +
 kcov-38/src/include/elf.hh                    |  129 +
 kcov-38/src/include/engine.hh                 |  124 +
 kcov-38/src/include/file-parser.hh            |  184 +
 kcov-38/src/include/filter.hh                 |   58 +
 kcov-38/src/include/gcov.hh                   |  182 +
 kcov-38/src/include/generated-data-base.hh    |   29 +
 kcov-38/src/include/lineid.hh                 |   14 +
 kcov-38/src/include/manager.hh                |   10 +
 kcov-38/src/include/output-handler.hh         |   34 +
 kcov-38/src/include/phdr_data.h               |   50 +
 kcov-38/src/include/reporter.hh               |  130 +
 kcov-38/src/include/solib-handler.hh          |   22 +
 kcov-38/src/include/source-file-cache.hh      |   38 +
 kcov-38/src/include/swap-endian.hh            |   67 +
 kcov-38/src/include/system-mode/file-data.hh  |   66 +
 .../src/include/system-mode/registration.hh   |   23 +
 kcov-38/src/include/utils.hh                  |  212 ++
 kcov-38/src/include/writer.hh                 |   33 +
 kcov-38/src/kernel/Makefile                   |   12 +
 kcov-38/src/kernel/kprobe-coverage.c          |  589 ++++
 kcov-38/src/main-system-daemon.cc             |  472 +++
 kcov-38/src/main.cc                           |  579 ++++
 kcov-38/src/merge-file-parser.cc              |  616 ++++
 kcov-38/src/merge-parser.hh                   |   23 +
 kcov-38/src/output-handler.cc                 |  150 +
 kcov-38/src/parser-manager.cc                 |   63 +
 kcov-38/src/parsers/bfd-disassembler.cc       |  439 +++
 kcov-38/src/parsers/dummy-disassembler.cc     |   49 +
 kcov-38/src/parsers/dwarf-libdwarf.cc         |  152 +
 kcov-38/src/parsers/dwarf.cc                  |  229 ++
 kcov-38/src/parsers/dwarf.hh                  |   32 +
 kcov-38/src/parsers/elf-parser.cc             |  585 ++++
 kcov-38/src/parsers/elf.cc                    |  275 ++
 kcov-38/src/parsers/libdwarf-dwarf.cpp        |    9 +
 kcov-38/src/reporter.cc                       |  788 +++++
 kcov-38/src/solib-handler.cc                  |  281 ++
 kcov-38/src/solib-parser/lib.c                |  125 +
 kcov-38/src/solib-parser/phdr_data.c          |  108 +
 kcov-38/src/source-file-cache.cc              |  112 +
 kcov-38/src/system-mode/file-data.cc          |  280 ++
 kcov-38/src/system-mode/registration.cc       |   66 +
 kcov-38/src/utils.cc                          |  722 ++++
 kcov-38/src/writers/cobertura-writer.cc       |  206 ++
 kcov-38/src/writers/cobertura-writer.hh       |   13 +
 kcov-38/src/writers/coveralls-writer.cc       |  248 ++
 kcov-38/src/writers/coveralls-writer.hh       |    9 +
 kcov-38/src/writers/dummy-coveralls-writer.cc |   29 +
 kcov-38/src/writers/html-writer.cc            |  413 +++
 kcov-38/src/writers/html-writer.hh            |   14 +
 kcov-38/src/writers/json-writer.cc            |  131 +
 kcov-38/src/writers/json-writer.hh            |   11 +
 kcov-38/src/writers/sonarqube-xml-writer.cc   |  106 +
 kcov-38/src/writers/sonarqube-xml-writer.hh   |   11 +
 kcov-38/src/writers/writer-base.cc            |  167 +
 kcov-38/src/writers/writer-base.hh            |   64 +
 kcov-38/tests/CMakeLists.txt                  |  193 ++
 kcov-38/tests/argv-dependent.c                |   23 +
 kcov-38/tests/assembly/illegal-insn.S         |    4 +
 kcov-38/tests/bash/dollar-one-question.sh     |    4 +
 kcov-38/tests/bash/dollar-var-replacements.sh |    5 +
 kcov-38/tests/bash/first-dir/a.sh             |   10 +
 kcov-38/tests/bash/first-dir/b.sh             |    3 +
 kcov-38/tests/bash/first-dir/c.sh             |    4 +
 kcov-38/tests/bash/function-with-spaces.sh    |   19 +
 kcov-38/tests/bash/handle-all-output.sh       |    5 +
 kcov-38/tests/bash/multiline-alias.sh         |    6 +
 kcov-38/tests/bash/multiline-backslash.sh     |    5 +
 kcov-38/tests/bash/no-executed-statements.sh  |    6 +
 kcov-38/tests/bash/other.sh                   |   55 +
 kcov-38/tests/bash/redirect-stderr.sh         |    3 +
 kcov-38/tests/bash/second-dir/a.sh            |   10 +
 kcov-38/tests/bash/second-dir/b.sh            |    3 +
 kcov-38/tests/bash/second-dir/c.sh            |    4 +
 kcov-38/tests/bash/sh-shebang.sh              |    4 +
 kcov-38/tests/bash/shell-main                 |  180 +
 kcov-38/tests/bash/short-test.sh              |    6 +
 kcov-38/tests/bash/subshell.sh                |    8 +
 kcov-38/tests/bash/trap.sh                    |   14 +
 kcov-38/tests/bash/unitundertest.sh           |   40 +
 kcov-38/tests/daemon/test-daemon.cc           |   44 +
 kcov-38/tests/daemon/test-issue31.cc          |   32 +
 kcov-38/tests/daemon/test-script.sh           |   20 +
 kcov-38/tests/dlopen/dlopen-main.cc           |   13 +
 kcov-38/tests/dlopen/dlopen.cc                |   28 +
 kcov-38/tests/fork/fork+exec.c                |   32 +
 kcov-38/tests/fork/fork-no-wait.c             |   30 +
 kcov-38/tests/fork/fork.c                     |   47 +
 kcov-38/tests/fork/vfork.c                    |   27 +
 .../global-constructors/test-global-ctors.cc  |   14 +
 kcov-38/tests/include/header.h                |   17 +
 kcov-38/tests/main.cc                         |   26 +
 kcov-38/tests/merge-tests/file.c              |    9 +
 kcov-38/tests/merge-tests/main_1.c            |   13 +
 kcov-38/tests/merge-tests/main_2.c            |   13 +
 kcov-38/tests/multi-fork/code-template.c      |   29 +
 .../tests/multi-fork/generate-functions.py    |   29 +
 kcov-38/tests/multi-fork/test-multi-fork.c    |   46 +
 kcov-38/tests/pie.c                           |    7 +
 kcov-38/tests/popen/test-popen.c              |   63 +
 kcov-38/tests/python/main                     |   30 +
 kcov-38/tests/python/second.py                |   78 +
 kcov-38/tests/python/short-test.py            |   10 +
 kcov-38/tests/python/unittest/testdriver      |   28 +
 .../tests/python/unittest/unitundertest.py    |   11 +
 kcov-38/tests/recursive-ptrace/main.cc        |   68 +
 kcov-38/tests/sanitizer-coverage.c            |   26 +
 .../tests/setpgid-kill/setpgid-kill-main.cc   |   28 +
 kcov-38/tests/setpgid-kill/test-script.sh     |   16 +
 kcov-38/tests/shared-library/big-symbol.S     |    9 +
 kcov-38/tests/shared-library/main.c           |   12 +
 .../shared-library/recursive-ld-preload.c     |    7 +
 kcov-38/tests/shared-library/solib.c          |   18 +
 kcov-38/tests/short-file.c                    |    1 +
 kcov-38/tests/signals/test-signals.c          |  297 ++
 kcov-38/tests/subdir/file.c                   |    8 +
 kcov-38/tests/subdir2/file.c                  |    8 +
 kcov-38/tests/subdir2/file2.c                 |    8 +
 kcov-38/tests/test-module/Makefile            |   12 +
 kcov-38/tests/test-module/test_module.c       |   64 +
 kcov-38/tests/threads/thread-main.c           |   40 +
 kcov-38/tests/tools/accumulate.py             |   80 +
 kcov-38/tests/tools/bash.py                   |  326 ++
 kcov-38/tests/tools/bash_linux_only.py        |   12 +
 kcov-38/tests/tools/basic.py                  |   28 +
 kcov-38/tests/tools/compiled.py               |  474 +++
 kcov-38/tests/tools/dummy-python.sh           |    3 +
 kcov-38/tests/tools/filter.py                 |   44 +
 kcov-38/tests/tools/parse_cobertura.py        |   82 +
 kcov-38/tests/tools/python.py                 |  111 +
 kcov-38/tests/tools/run-tests                 |   27 +
 kcov-38/tests/tools/system_mode.py            |   68 +
 kcov-38/tests/tools/testbase.py               |   65 +
 kcov-38/tests/unit-tests/CMakeLists.txt       |  126 +
 kcov-38/tests/unit-tests/main.cc              |   11 +
 .../tests/unit-tests/mocks/mock-collector.hh  |   23 +
 kcov-38/tests/unit-tests/mocks/mock-engine.hh |   26 +
 .../tests/unit-tests/mocks/mock-reporter.hh   |   39 +
 kcov-38/tests/unit-tests/second-source.c      |    8 +
 kcov-38/tests/unit-tests/test-source.c        |   20 +
 kcov-38/tests/unit-tests/test.hh              |    6 +
 kcov-38/tests/unit-tests/tests-collector.cc   |   87 +
 .../tests/unit-tests/tests-configuration.cc   |  150 +
 kcov-38/tests/unit-tests/tests-elf.cc         |   68 +
 kcov-38/tests/unit-tests/tests-filter.cc      |   85 +
 .../tests/unit-tests/tests-merge-parser.cc    |  312 ++
 kcov-38/tests/unit-tests/tests-reporter.cc    |  151 +
 kcov-38/tests/unit-tests/tests-system-mode.cc |  449 +++
 kcov-38/tests/unit-tests/tests-utils.cc       |   69 +
 kcov-38/tests/unit-tests/tests-writer.cc      |  198 ++
 kcov-38/tools/CMakeLists.txt                  |   83 +
 kcov-38/tools/line2addr.cc                    |   73 +
 kcov-38/travis/Makefile                       |  159 +
 kcov-38/travis/perf-test.sh                   |   18 +
 303 files changed, 41432 insertions(+), 3 deletions(-)
 create mode 100644 kcov-38/.dockerignore
 create mode 100644 kcov-38/.gitignore
 create mode 100644 kcov-38/.gitmodules
 create mode 100644 kcov-38/.travis.yml
 create mode 100644 kcov-38/CMakeLists.txt
 create mode 100644 kcov-38/CONTRIBUTING.md
 create mode 100644 kcov-38/COPYING
 create mode 100644 kcov-38/COPYING.externals
 create mode 100644 kcov-38/CPack.local.cmake
 create mode 100644 kcov-38/ChangeLog
 create mode 100644 kcov-38/Dockerfile
 create mode 100644 kcov-38/INSTALL.md
 create mode 120000 kcov-38/README
 create mode 100644 kcov-38/README.md
 create mode 100644 kcov-38/cmake/FindBfd.cmake
 create mode 100644 kcov-38/cmake/FindElfutils.cmake
 create mode 100644 kcov-38/cmake/FindLibCRPCUT.cmake
 create mode 100644 kcov-38/cmake/FindLibElf.cmake
 create mode 100644 kcov-38/cmake/TargetArch.cmake
 create mode 100644 kcov-38/data/amber.png
 create mode 100644 kcov-38/data/bcov.css
 create mode 100644 kcov-38/data/glass.png
 create mode 100644 kcov-38/data/index.html
 create mode 100644 kcov-38/data/js/handlebars.js
 create mode 100644 kcov-38/data/js/jquery.min.js
 create mode 100644 kcov-38/data/js/jquery.tablesorter.min.js
 create mode 100644 kcov-38/data/js/jquery.tablesorter.widgets.min.js
 create mode 100644 kcov-38/data/js/kcov.js
 create mode 100644 kcov-38/data/source-file.html
 create mode 100644 kcov-38/data/tablesorter-theme.css
 create mode 100644 kcov-38/debian/.gitignore
 create mode 100644 kcov-38/debian/README
 create mode 100644 kcov-38/debian/changelog
 create mode 100644 kcov-38/debian/compat
 create mode 100644 kcov-38/debian/control
 create mode 100644 kcov-38/debian/copyright
 create mode 100644 kcov-38/debian/kcov-docs.docs
 create mode 100755 kcov-38/debian/rules
 create mode 100644 kcov-38/debian/source/format
 create mode 100644 kcov-38/doc/CMakeLists.txt
 create mode 100644 kcov-38/doc/codecov.md
 create mode 100644 kcov-38/doc/coveralls.md
 create mode 100644 kcov-38/doc/design.txt
 create mode 100644 kcov-38/doc/full-system-instrumentation.md
 create mode 100644 kcov-38/doc/gitlab.md
 create mode 100644 kcov-38/doc/jenkins.md
 create mode 100644 kcov-38/doc/kcov.1
 create mode 100644 kcov-38/doc/sonarqube.md
 create mode 100644 kcov-38/external/lldb/include/lldb/API/LLDB.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBAddress.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBBlock.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommunication.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBData.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBDebugger.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBDefines.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBError.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBEvent.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBFrame.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBFunction.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBHostOS.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBInstruction.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBListener.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBModule.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBPlatform.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBProcess.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBQueue.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBSection.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBStream.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBStringList.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbol.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTarget.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBThread.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBType.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBValue.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBValueList.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
 create mode 100644 kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
 create mode 100644 kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
 create mode 100644 kcov-38/external/lldb/include/lldb/lldb-defines.h
 create mode 100644 kcov-38/external/lldb/include/lldb/lldb-enumerations.h
 create mode 100644 kcov-38/external/lldb/include/lldb/lldb-forward.h
 create mode 100644 kcov-38/external/lldb/include/lldb/lldb-types.h
 create mode 100644 kcov-38/external/lldb/include/lldb/lldb-versioning.h
 create mode 100644 kcov-38/src/CMakeLists.txt
 create mode 100755 kcov-38/src/bin-to-c-source.py
 create mode 100644 kcov-38/src/capabilities.cc
 create mode 100644 kcov-38/src/cmake_uninstall.cmake.in
 create mode 100644 kcov-38/src/collector.cc
 create mode 100644 kcov-38/src/configuration.cc
 create mode 100644 kcov-38/src/dummy-solib-handler.cc
 create mode 100644 kcov-38/src/engine-factory.cc
 create mode 100644 kcov-38/src/engines/bash-engine.cc
 create mode 100644 kcov-38/src/engines/bash-execve-redirector.c
 create mode 100755 kcov-38/src/engines/bash-helper-debug-trap.sh
 create mode 100644 kcov-38/src/engines/bash-helper.sh
 create mode 100644 kcov-38/src/engines/clang-coverage-engine.cc
 create mode 100644 kcov-38/src/engines/gcov-engine.cc
 create mode 100644 kcov-38/src/engines/kernel-engine.cc
 create mode 100644 kcov-38/src/engines/lldb-engine.cc
 create mode 100644 kcov-38/src/engines/ptrace.cc
 create mode 100644 kcov-38/src/engines/ptrace_freebsd.cc
 create mode 100644 kcov-38/src/engines/ptrace_linux.cc
 create mode 100644 kcov-38/src/engines/ptrace_sys.hh
 create mode 100644 kcov-38/src/engines/python-engine.cc
 create mode 100644 kcov-38/src/engines/python-helper.py
 create mode 100644 kcov-38/src/engines/script-engine-base.hh
 create mode 100644 kcov-38/src/engines/system-mode-binary-lib.cc
 create mode 100644 kcov-38/src/engines/system-mode-engine.cc
 create mode 100644 kcov-38/src/engines/system-mode-file-format.cc
 create mode 100644 kcov-38/src/engines/system-mode-file-format.hh
 create mode 100644 kcov-38/src/filter.cc
 create mode 100644 kcov-38/src/gcov.cc
 create mode 100644 kcov-38/src/include/capabilities.hh
 create mode 100644 kcov-38/src/include/collector.hh
 create mode 100644 kcov-38/src/include/configuration.hh
 create mode 100644 kcov-38/src/include/disassembler.hh
 create mode 100644 kcov-38/src/include/elf.hh
 create mode 100644 kcov-38/src/include/engine.hh
 create mode 100644 kcov-38/src/include/file-parser.hh
 create mode 100644 kcov-38/src/include/filter.hh
 create mode 100644 kcov-38/src/include/gcov.hh
 create mode 100644 kcov-38/src/include/generated-data-base.hh
 create mode 100644 kcov-38/src/include/lineid.hh
 create mode 100644 kcov-38/src/include/manager.hh
 create mode 100644 kcov-38/src/include/output-handler.hh
 create mode 100644 kcov-38/src/include/phdr_data.h
 create mode 100644 kcov-38/src/include/reporter.hh
 create mode 100644 kcov-38/src/include/solib-handler.hh
 create mode 100644 kcov-38/src/include/source-file-cache.hh
 create mode 100644 kcov-38/src/include/swap-endian.hh
 create mode 100644 kcov-38/src/include/system-mode/file-data.hh
 create mode 100644 kcov-38/src/include/system-mode/registration.hh
 create mode 100644 kcov-38/src/include/utils.hh
 create mode 100644 kcov-38/src/include/writer.hh
 create mode 100644 kcov-38/src/kernel/Makefile
 create mode 100644 kcov-38/src/kernel/kprobe-coverage.c
 create mode 100644 kcov-38/src/main-system-daemon.cc
 create mode 100644 kcov-38/src/main.cc
 create mode 100644 kcov-38/src/merge-file-parser.cc
 create mode 100644 kcov-38/src/merge-parser.hh
 create mode 100644 kcov-38/src/output-handler.cc
 create mode 100644 kcov-38/src/parser-manager.cc
 create mode 100644 kcov-38/src/parsers/bfd-disassembler.cc
 create mode 100644 kcov-38/src/parsers/dummy-disassembler.cc
 create mode 100644 kcov-38/src/parsers/dwarf-libdwarf.cc
 create mode 100644 kcov-38/src/parsers/dwarf.cc
 create mode 100644 kcov-38/src/parsers/dwarf.hh
 create mode 100644 kcov-38/src/parsers/elf-parser.cc
 create mode 100644 kcov-38/src/parsers/elf.cc
 create mode 100644 kcov-38/src/parsers/libdwarf-dwarf.cpp
 create mode 100644 kcov-38/src/reporter.cc
 create mode 100644 kcov-38/src/solib-handler.cc
 create mode 100644 kcov-38/src/solib-parser/lib.c
 create mode 100644 kcov-38/src/solib-parser/phdr_data.c
 create mode 100644 kcov-38/src/source-file-cache.cc
 create mode 100644 kcov-38/src/system-mode/file-data.cc
 create mode 100644 kcov-38/src/system-mode/registration.cc
 create mode 100644 kcov-38/src/utils.cc
 create mode 100644 kcov-38/src/writers/cobertura-writer.cc
 create mode 100644 kcov-38/src/writers/cobertura-writer.hh
 create mode 100644 kcov-38/src/writers/coveralls-writer.cc
 create mode 100644 kcov-38/src/writers/coveralls-writer.hh
 create mode 100644 kcov-38/src/writers/dummy-coveralls-writer.cc
 create mode 100644 kcov-38/src/writers/html-writer.cc
 create mode 100644 kcov-38/src/writers/html-writer.hh
 create mode 100644 kcov-38/src/writers/json-writer.cc
 create mode 100644 kcov-38/src/writers/json-writer.hh
 create mode 100644 kcov-38/src/writers/sonarqube-xml-writer.cc
 create mode 100644 kcov-38/src/writers/sonarqube-xml-writer.hh
 create mode 100644 kcov-38/src/writers/writer-base.cc
 create mode 100644 kcov-38/src/writers/writer-base.hh
 create mode 100644 kcov-38/tests/CMakeLists.txt
 create mode 100644 kcov-38/tests/argv-dependent.c
 create mode 100644 kcov-38/tests/assembly/illegal-insn.S
 create mode 100755 kcov-38/tests/bash/dollar-one-question.sh
 create mode 100755 kcov-38/tests/bash/dollar-var-replacements.sh
 create mode 100644 kcov-38/tests/bash/first-dir/a.sh
 create mode 100644 kcov-38/tests/bash/first-dir/b.sh
 create mode 100644 kcov-38/tests/bash/first-dir/c.sh
 create mode 100755 kcov-38/tests/bash/function-with-spaces.sh
 create mode 100755 kcov-38/tests/bash/handle-all-output.sh
 create mode 100755 kcov-38/tests/bash/multiline-alias.sh
 create mode 100755 kcov-38/tests/bash/multiline-backslash.sh
 create mode 100755 kcov-38/tests/bash/no-executed-statements.sh
 create mode 100644 kcov-38/tests/bash/other.sh
 create mode 100755 kcov-38/tests/bash/redirect-stderr.sh
 create mode 100644 kcov-38/tests/bash/second-dir/a.sh
 create mode 100644 kcov-38/tests/bash/second-dir/b.sh
 create mode 100644 kcov-38/tests/bash/second-dir/c.sh
 create mode 100755 kcov-38/tests/bash/sh-shebang.sh
 create mode 100755 kcov-38/tests/bash/shell-main
 create mode 100755 kcov-38/tests/bash/short-test.sh
 create mode 100755 kcov-38/tests/bash/subshell.sh
 create mode 100755 kcov-38/tests/bash/trap.sh
 create mode 100755 kcov-38/tests/bash/unitundertest.sh
 create mode 100644 kcov-38/tests/daemon/test-daemon.cc
 create mode 100644 kcov-38/tests/daemon/test-issue31.cc
 create mode 100755 kcov-38/tests/daemon/test-script.sh
 create mode 100644 kcov-38/tests/dlopen/dlopen-main.cc
 create mode 100644 kcov-38/tests/dlopen/dlopen.cc
 create mode 100644 kcov-38/tests/fork/fork+exec.c
 create mode 100644 kcov-38/tests/fork/fork-no-wait.c
 create mode 100644 kcov-38/tests/fork/fork.c
 create mode 100644 kcov-38/tests/fork/vfork.c
 create mode 100644 kcov-38/tests/global-constructors/test-global-ctors.cc
 create mode 100644 kcov-38/tests/include/header.h
 create mode 100644 kcov-38/tests/main.cc
 create mode 100644 kcov-38/tests/merge-tests/file.c
 create mode 100644 kcov-38/tests/merge-tests/main_1.c
 create mode 100644 kcov-38/tests/merge-tests/main_2.c
 create mode 100644 kcov-38/tests/multi-fork/code-template.c
 create mode 100755 kcov-38/tests/multi-fork/generate-functions.py
 create mode 100644 kcov-38/tests/multi-fork/test-multi-fork.c
 create mode 100644 kcov-38/tests/pie.c
 create mode 100644 kcov-38/tests/popen/test-popen.c
 create mode 100755 kcov-38/tests/python/main
 create mode 100644 kcov-38/tests/python/second.py
 create mode 100755 kcov-38/tests/python/short-test.py
 create mode 100755 kcov-38/tests/python/unittest/testdriver
 create mode 100644 kcov-38/tests/python/unittest/unitundertest.py
 create mode 100644 kcov-38/tests/recursive-ptrace/main.cc
 create mode 100644 kcov-38/tests/sanitizer-coverage.c
 create mode 100644 kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
 create mode 100755 kcov-38/tests/setpgid-kill/test-script.sh
 create mode 100644 kcov-38/tests/shared-library/big-symbol.S
 create mode 100644 kcov-38/tests/shared-library/main.c
 create mode 100644 kcov-38/tests/shared-library/recursive-ld-preload.c
 create mode 100644 kcov-38/tests/shared-library/solib.c
 create mode 100644 kcov-38/tests/short-file.c
 create mode 100644 kcov-38/tests/signals/test-signals.c
 create mode 100644 kcov-38/tests/subdir/file.c
 create mode 100644 kcov-38/tests/subdir2/file.c
 create mode 100644 kcov-38/tests/subdir2/file2.c
 create mode 100644 kcov-38/tests/test-module/Makefile
 create mode 100644 kcov-38/tests/test-module/test_module.c
 create mode 100644 kcov-38/tests/threads/thread-main.c
 create mode 100644 kcov-38/tests/tools/accumulate.py
 create mode 100644 kcov-38/tests/tools/bash.py
 create mode 100644 kcov-38/tests/tools/bash_linux_only.py
 create mode 100644 kcov-38/tests/tools/basic.py
 create mode 100644 kcov-38/tests/tools/compiled.py
 create mode 100755 kcov-38/tests/tools/dummy-python.sh
 create mode 100644 kcov-38/tests/tools/filter.py
 create mode 100755 kcov-38/tests/tools/parse_cobertura.py
 create mode 100644 kcov-38/tests/tools/python.py
 create mode 100755 kcov-38/tests/tools/run-tests
 create mode 100644 kcov-38/tests/tools/system_mode.py
 create mode 100644 kcov-38/tests/tools/testbase.py
 create mode 100644 kcov-38/tests/unit-tests/CMakeLists.txt
 create mode 100644 kcov-38/tests/unit-tests/main.cc
 create mode 100644 kcov-38/tests/unit-tests/mocks/mock-collector.hh
 create mode 100644 kcov-38/tests/unit-tests/mocks/mock-engine.hh
 create mode 100644 kcov-38/tests/unit-tests/mocks/mock-reporter.hh
 create mode 100644 kcov-38/tests/unit-tests/second-source.c
 create mode 100644 kcov-38/tests/unit-tests/test-source.c
 create mode 100644 kcov-38/tests/unit-tests/test.hh
 create mode 100644 kcov-38/tests/unit-tests/tests-collector.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-configuration.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-elf.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-filter.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-merge-parser.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-reporter.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-system-mode.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-utils.cc
 create mode 100644 kcov-38/tests/unit-tests/tests-writer.cc
 create mode 100644 kcov-38/tools/CMakeLists.txt
 create mode 100644 kcov-38/tools/line2addr.cc
 create mode 100644 kcov-38/travis/Makefile
 create mode 100755 kcov-38/travis/perf-test.sh

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index d1d52e8b9f50..4c5327de50b8 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -21,7 +21,7 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           cargo install cargo-tarpaulin
-          cargo tarpaulin --out Xml
+          cargo tarpaulin make test-vectors --out Xml
           bash <(curl -s https://codecov.io/bash) -X gcov -t $CODECOV_TOKEN
   test:
     name: test
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 702a0b1c9c3f..020715d78c31 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -27,8 +27,8 @@ jobs:
       - name: Install apt packages
         run: |
             sudo apt install ocl-icd-opencl-dev make clang pkg-config libssl-dev libclang-dev
-            sudo apt-get install -y libhwloc-dev
-    
+            sudo apt-get install -y libhwloc-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc
+
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
diff --git a/kcov-38/.dockerignore b/kcov-38/.dockerignore
new file mode 100644
index 000000000000..6a6e01c108cb
--- /dev/null
+++ b/kcov-38/.dockerignore
@@ -0,0 +1,2 @@
+Dockerfile
+build
diff --git a/kcov-38/.gitignore b/kcov-38/.gitignore
new file mode 100644
index 000000000000..d824ba11c26a
--- /dev/null
+++ b/kcov-38/.gitignore
@@ -0,0 +1,13 @@
+*.o
+*~
+*.pyc
+*.pyo
+*.cmd
+.tmp_versions
+*.ko
+*.symvers
+*.order
+*.mod.c
+kcov
+build
+obj-*/
diff --git a/kcov-38/.gitmodules b/kcov-38/.gitmodules
new file mode 100644
index 000000000000..4177d127eb92
--- /dev/null
+++ b/kcov-38/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests/unit-tests/trompeloeil"]
+	path = tests/unit-tests/trompeloeil
+	url = https://github.com/rollbear/trompeloeil.git
diff --git a/kcov-38/.travis.yml b/kcov-38/.travis.yml
new file mode 100644
index 000000000000..3892f43a2108
--- /dev/null
+++ b/kcov-38/.travis.yml
@@ -0,0 +1,47 @@
+# Build matrix / environment variable are explained on:
+# http://about.travis-ci.org/docs/user/build-configuration/
+# This file can be validated on:
+# http://lint.travis-ci.org/
+
+sudo: required
+dist: trusty
+
+before_install: make -f travis/Makefile prepare_environment
+
+os:
+  - linux
+  - osx
+
+language: cpp
+compiler:
+  - gcc
+  - clang
+
+
+env:
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+   - secure: "WG/iday4nudNJ9acP/gjjuXzI0Jw0MN0zP9JA3WueMvMV0UrVRnBKM+papB06XiB4Gyiaoy92pfOGzmby0ciMAvydBn2DyuGZhM1nXuEIbkQqfP3AR3z6nCZHY27NAhVnpnEAyb56FwD353JMVZj34cnRmcjgKArMM3Y8W66Zls="
+   # This, and before_script, is taken from from https://github.com/umlaeute/Gem
+   - COVERITY_SCAN_BRANCH_PATTERN="master"
+   - COVERITY_SCAN_NOTIFICATION_EMAIL="simon.kagstrom@gmail.com"
+   - COVERITY_SCAN_BUILD_COMMAND_PREPEND="mkdir -p coverity-build && cd coverity-build && cmake .. && cd .."
+   - COVERITY_SCAN_BUILD_COMMAND="make -C coverity-build"
+   - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
+
+
+before_script:
+    - mkdir -p coverity-build && cd coverity-build && cmake .. && cd ..
+    - if [[ "x${CC}" = "xclang" ]] ; then curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash || true ; fi
+
+
+script: make -f travis/Makefile run-tests
+
+notifications:
+  recipients:
+    - simon.kagstrom@gmail.com
+  email:
+    on_success: change
+    on_failure: always
+
diff --git a/kcov-38/CMakeLists.txt b/kcov-38/CMakeLists.txt
new file mode 100644
index 000000000000..a71af0072b4b
--- /dev/null
+++ b/kcov-38/CMakeLists.txt
@@ -0,0 +1,50 @@
+cmake_minimum_required (VERSION 2.8.4)
+project (kcov)
+
+set (PROJECT_VERSION_MAJOR 35)
+set (PROJECT_VERSION_MINOR 0)
+set (PROJECT_VERSION_PATCH 0)
+set (PROJECT_VERSION
+     "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+
+if (POLICY CMP0042)
+  # MACOSX_RPATH is enabled by default.
+  cmake_policy (SET CMP0042 NEW)
+endif (POLICY CMP0042)
+
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set (CMAKE_BUILD_TYPE Release CACHE STRING
+       "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
+       FORCE)
+  set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
+                STRINGS None Debug Release RelWithDebInfo MinSizeRel)
+endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+
+add_definitions(-DPACKAGE)
+add_definitions(-DPACKAGE_VERSION)
+# ====================================
+# configuring
+# ====================================
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+option (SPECIFY_RPATH  "Specify RPATH for installed executables" OFF)
+mark_as_advanced (SPECIFY_RPATH)
+
+# ====================================
+# default install paths for targets
+# ====================================
+include (CPack.local.cmake OPTIONAL)
+
+set (KCOV_INSTALL_BINDIR "bin" CACHE STRING "Install destination for user executables")
+set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for documentation")
+set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation")
+mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR)
+
+install (FILES ChangeLog COPYING COPYING.externals
+         DESTINATION "${KCOV_INSTALL_DOCDIR}")
+
+# ====================================
+# build all
+# ====================================
+add_subdirectory (src)
+add_subdirectory (doc)
diff --git a/kcov-38/CONTRIBUTING.md b/kcov-38/CONTRIBUTING.md
new file mode 100644
index 000000000000..3c6330e097f3
--- /dev/null
+++ b/kcov-38/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Contributing to Kcov
+
+Contributors are welcome!
+
+## Patch acceptance process
+
+* If the contribution is a fix to a bug report or an issue, prefix the commit
+  message with Issue #xxx
+
+* Submit a pull request via github
+
+* There is some documentation about the design in the doc/ subdirectory
diff --git a/kcov-38/COPYING b/kcov-38/COPYING
new file mode 100644
index 000000000000..d159169d1050
--- /dev/null
+++ b/kcov-38/COPYING
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/kcov-38/COPYING.externals b/kcov-38/COPYING.externals
new file mode 100644
index 000000000000..4f206baaa144
--- /dev/null
+++ b/kcov-38/COPYING.externals
@@ -0,0 +1,3 @@
+handlebars.js: MIT
+tablesorter (mottie): GPLv2 or MIT
+jquery: MIT
diff --git a/kcov-38/CPack.local.cmake b/kcov-38/CPack.local.cmake
new file mode 100644
index 000000000000..d6baacb1ab95
--- /dev/null
+++ b/kcov-38/CPack.local.cmake
@@ -0,0 +1,29 @@
+# ====================================
+# cpack settings
+# ====================================
+set (CPACK_PACKAGE_VERSION_MAJOR  ${PROJECT_VERSION_MAJOR})
+set (CPACK_PACKAGE_VERSION_MINOR  ${PROJECT_VERSION_MINOR})
+set (CPACK_PACKAGE_VERSION_PATCH  ${PROJECT_VERSION_PATCH})
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code coverage tester based on Bcov")
+set (CPACK_PACKAGE_DESCRIPTION_FILE  "${PROJECT_SOURCE_DIR}/README")
+set (CPACK_RESOURCE_FILE_LICENSE  "${PROJECT_SOURCE_DIR}/COPYING")
+set (CPACK_RESOURCE_FILE_README  "${PROJECT_SOURCE_DIR}/README")
+set (CPACK_PACKAGE_VENDOR  "Simon Kagstrom")
+set (CPACK_PACKAGE_CONTACT "Simon Kagstrom <simon.kagstrom@gmail.com>")
+set (CPACK_STRIP_FILES ON)
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES
+  /Debug/  /Release/  /build/
+  /.git/  /.gitignore
+  .*~  .*.log
+)
+
+set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+    /usr/share/man /usr/share/man/man1
+    /usr/local/share/man /usr/local/share/man/man1)
+
+set (CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set (CPACK_DEBIAN_PACKAGE_HOMEPAGE https://simonkagstrom.github.io/kcov/)
+
+include (CPack)
diff --git a/kcov-38/ChangeLog b/kcov-38/ChangeLog
new file mode 100644
index 000000000000..8bbafa566391
--- /dev/null
+++ b/kcov-38/ChangeLog
@@ -0,0 +1,740 @@
+Kcov (38):
+	* Issue #267: Fix hang on Aarch64 (Julian Stecklina)
+
+    -- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jan 17 12:10:17 CET 2020
+
+Kcov (37):
+    * Issue #312: Avoid unaligned access warnings for merged data
+      (Didri Boukelmoune)
+
+    * Issue #309: Correct encoding for non-english charsets (Zhenwei Ding)
+
+    * Issues #307, #308: Python 3 cleanup (Didri Boukelmoune)
+
+    * Issue #304: Bash: Correct PS4 parsing (Koichi Nakashima)
+
+    * Issues #295, #296: Comply with Cobertura coverage-04.dtd (Arnaud Botella)
+
+    * Issues #292, #294 : bash: Correct peek_file, xtrace-fd handling (kimkim19642004)
+
+    * Issues #282, #286, #287 Lots of build system fixes (Jamie Snape,
+      Akos Somfai)
+
+    * Issue #285: Cobertura schema fixed
+
+    * Issue #279: Rust: #[should_panic] files are now ignored
+
+    * Issue #274: Automated docker builds (Manuel Mendez)
+
+    * Issues #268, #310: A Debian packate file has been added (Paul Dreik)
+
+    * Issue #190: Code style changed to K&R
+
+    -- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Oct  1 09:14:07 CEST 2019
+
+Kcov (36):
+    * Issue #253: Kcov has been ported to FreeBSD (Alan Somers)
+
+    * Issue #243: ptrace build fixes (Leo Gaspard)
+
+    * Issue #245: Major cmake build system fixes (Jamie Snape)
+
+    * Issue #250: Improve checks for Python command
+
+    * Issue #259: Use --include-pattern in merge mode
+
+    * Issue #166: Fix make-based builds on OSX
+
+    * Issue #157: OSX now supports covering shared libraries
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Aug 23 12:46:49 CEST 2018
+
+Kcov (35):
+	* Issue #240: Allow running on systems with > 32/64 CPUs
+	  (Alexandra Ghecenco)
+
+	* Issue #178: Fix build for Aarch64 (Dridi Boukelmoune)
+
+	* Issue #223: Add --clean to make turn off accumulation
+
+	* Issue #224: Show uncovered scripts in bash reports
+
+	* Only build the system daemon if libelf isn't available
+
+	* Issue #208: Allow covering multiple binaries with the same name
+	  in the same report
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Apr 19 20:22:30 CEST 2018
+
+Kcov (34):
+	* Issue #215: Correct build with binutils >= 2.29
+
+	* Issue #216: Don't use SIGUNUSED (Dridi Boukelmoune)
+
+	* Issue #211: Avoid blocking bash write (Mike Bland)
+
+	* Issue #198: Correct skipped breakpoint count
+
+	* Issue #92: kcov can now perform full-system instrumentation via a
+	  daemon and statically instrumented binaries
+
+	* Issue #193: Handle all available bash output (Ashley Straw)
+
+	* Issue #187: Fix crash regression due to address verifier changes
+
+	* Issue #166, Issue #209: Describe workaround for OSX build problems
+
+	* Issue #183: python: Quote argument strings to avoid argv issues (Bashkar Rana)
+
+	* Unit tests build again
+
+	* Issue #165: bash: Provide basic parser mode to workaround bugs in the
+	  parser
+
+	* Issue #178: Port to AArch64 (though untested!)
+
+	* Issue #180: kcov now honors LCOV_EXCL_LINE/START/STOP, so that regions of
+	  code can be excluded from the report. Command-line options can also set
+	  custom patterns (Me, Keith Wansbrough)
+
+	* Issue #175: kcov can now ignore unreachable lines (Thomas Neumann)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Sep 10 13:11:34 CEST 2017
+
+Kcov (33):
+	* Issue #167: Writers: Add pure JSON writer for gitlabCI (http://gitlab.com)
+	  integration (Bryce Fisher-Fleig)
+
+	* Issue #162: Use Xcode build in addtion to Make for Travis
+
+	* Issue #163: Correct attaching to processes which create threads (ptrace)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jan 13 09:59:53 CET 2017
+
+Kcov (32):
+	* Issue #135: Covering binaries on OSX is now possible as well!
+
+	* Issue #114, Issue #150, Kcov also works with codecov without changes!
+
+	* Issue #152, Issue #154: bash: Correct handling heredoc special cases
+
+	* Re-enable coverity for Travis CI builds again
+
+	* Issue #148: Correct handling of PTRACE events (Niklas Ögren)
+
+	* Issue #139: Create kcov-solib.pipe in a tempdir if out-dir is unfifoable
+
+	* Issue #141: Make [merged] name configurable via --configure
+
+	* Issue #138: Allow setting a different css file via --configure
+
+	* Issue #140: Allow specifying command name via --configure
+
+	* Issue #144: Allow setting configuration options manually with --configure
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Nov 22 12:32:41 CET 2016
+
+Kcov (31):
+	* Exit with 0 when running --version (Pietro Monteiro)
+
+	* travis: Run regression tests on OS X as well
+
+	* Issue #130: bash: Correct handling of data accumulation with absolute paths
+
+	* Issue #127: Add output support for the SonarQube coverage plugin
+
+	* Refactor travis tests to use pyunit instead of Robot Framework
+
+	* Allow --repace-src when running with --merge
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Apr 17 09:42:12 CEST 2016
+
+Kcov (30):
+	* Issue #121: Add --version to display the current kcov version
+
+	* Issue #119: Allow merged output to serve as input to another merge
+	  session
+
+	* Issue #21: Allow builds on Mac OSX as well (Python and Bash only)
+
+	* Issue #122: Fix memory leak when adding shared libraries (jba31)
+
+	* Issue #118: Correct merging of reports collected on another machine
+
+	* Issue #116/#117: bash: Correct corner-cases for herecdocs and arithmetic
+	  (Phil Whineray)
+
+	* Fix various spelling errors (Veres Lajos)
+
+	* Issue #110: Correct handling of vfork()
+
+	* --pid= requires an executable, actually say that as well (Vincent Gibert)
+
+	* Issue #105: Warn about --verify without binutils
+
+	* Issue #104: Correct handling of shared libraries with build-id debug
+	  information
+
+	* Fix --skip-solibs handling
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Nov 27 06:51:40 CET 2015
+
+kcov (29):
+	* Tagged v28 by mistake :-)
+
+Kcov (28):
+	* Don't report each invalid breakpoint on --verify (give a summary instead)
+
+	* Issue #103: html: Display error message if JavaScript is disabled in
+	  the browser 
+
+	* Issue #101: Fix regression which caused --collect-only to work only
+	  if the source code was available.
+
+	* Coveralls: Use source_digest instead of source (current API?)
+
+	* Issue #99: Add support for looking up debug info from .gnu_debuglink
+	  sections (Vincent Brillault)
+
+	* Issue #98: Show execution order in the HTML output and add headings for
+	  the source view
+
+	* Issue #26: Don't warn for non-existing ELFs (typically linux-vdso.so.1)
+
+	* Issue #91: Correctly generate [merged] output after running two programs
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Jul  4 05:16:21 CEST 2015
+
+Kcov (27):
+	* Issue #90: coveralls: Publish merged results if available
+
+	* Issue #88: bash: Correct handling of ${var#}
+
+	* Issue #87: Allow coveralls uploads when using --merge (Ricardo Martins)
+
+	* Issue #86: Fix build on distros with Python 3 as default (David Barnett)
+
+	* python: Improve handling of some corner-cases for '''-strings
+
+	* Issue #76: bash: Handle multi-line quoted strings
+
+	* Issue #60: Add --merge option to merge output of multiple runs (i.e.,
+	  what the kcov-merge script did, but now integrated)
+
+	* Issue #81: Make --include-path= combined with --include-pattern=
+	  coexist more naturally (i.e., consider both)
+
+	* Lookup realpath of the paths passed to --include/exclude-path=
+
+	* Issue #18: Add --verify option that checks that all breakpoints are
+	  set on proper addresses (i.e., instruction boundaries)
+
+	* Issue #80: Fix coverage accumulation for PIE executables
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri May  1 19:44:04 CEST 2015
+
+Kcov (26):
+	* Issue #77: Collect coverage for Position-Independent Executables
+	 (Kang Seonghoon)
+
+	* Issue #72: Don't crash on filenames <3 characters long (Kang Seonghoon)
+
+	* Issue #71: Don't skip instructions on SIGSTOP (unbreaks PowerPC)
+
+	* Issue #70: bash: Handle $# ad ${#var ..} (not comments)
+
+	* Issue #66: bash: Unbreak handling of arithmetic shifts (conflict with
+	  heredocs)
+
+	* Issue #65: merge-parser: Don't panic on non-existing files (e.g., if moved)
+
+	* Issue #64: bash: Always parse the file given on the command line
+
+	* Issue #63: bash: Correct check for empty braces
+
+	* Issue #62: bash: Check for balenced parenthesis (e.g., in cases)
+
+	* Issue #51: bash: Collect coverage for #!/bin/sh executables via preloading
+	  (off by default)
+
+	* bash: Add ability to use DEBUG trap instead of PS4 (off by default, not
+	  stable)
+
+	* Unbreak accumulation (for certain programs)
+
+	* Fix hanging regression introduced in v23 (don't take solib semaphore
+	  before open/read)
+
+	* Report file-not-found or file-not-executable errors more clearly
+
+	* Issue #61: bash-engine: Output trace data via BASH_XTRACEFD when possible
+	  (bash >= 4.2) and filter stdout to catch redirections otherwise
+
+	* Issue #58: Lookup program in $PATH if it's not given on the command line
+
+	* Issue #57: bash-engine: Correct handling of quoted multiline variables
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Mar 17 19:16:46 CET 2015
+
+Kcov (25):
+	* Make database files smaller by storing only executed addresses
+
+	* Issue #52: Don't include bash-helper.sh in the output
+
+	* Issue #54: Implement handling of coverage accumulation for shared
+	  libraries
+	  
+	* Issue #50: Make sure that Bash "heredoc" markers are words
+	
+	* Fix some failure handling coverity errors
+	  
+	* Issue #49 (WIP): Implement broken gcov engine (multiple issues still pending)
+
+	* Refactor configuration handling to be more generic (avoid setters,
+	  use key/value pairs via strings instead)
+	
+	* Add "capabilities" class to make parts of the implementation clearer
+	  
+	* HTML-writer: Correct off-by-one access to static data
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Feb 10 19:38:04 CET 2015
+
+Kcov (24):
+	* Misc performance improvements here and there
+
+	* Build: Use the travis-ci.org build service to make tests more
+	  reliable.
+
+	* Unbreak Python and Bash coverage collection on 32-bit builds
+
+	* Correct clang build (well, in Fedora 20 it still fails)
+
+	* Issue #43: Clarify elfutils dependency
+
+	* Issue #46: Add support for uploading to coveralls.io via the
+	 --coveralls-id=<travis-id-or-repo_token> option
+
+	* Issue #45: Bash: Fix coverage collection when executing sub-scripts as
+	  programs.
+
+	* Issue #31: Fix handling of attaching to pid in a multithreaded process.
+	  Implementation taken from GDB: kcov now loops through all threads in
+	  a process and attaches to each one.
+
+	* Issue #44: Bash: Fix issues with <<< redirection, which were parsed
+	  as here documents
+
+	* Update the HTML/Cobertura output to display single-shot, limited and
+	  unlimited output in a logical way
+
+	* Allow three hit modes for parsers/engines: Single-shot (covered or not,
+	  as in the merge parser), limited (as in ptrace) and unlimited (line
+	  execution count used in Python/Bash)
+
+	* Remove some ptrace-specific stuff from the Engine interface
+
+	* Document classes better
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jan  5 09:46:29 CET 2015
+
+Kcov (23):
+	* Correct use-after-free case when the solib thread is killed
+
+	* Default to 5s output interval to avoid costly write-to-disk sessions
+	  too often
+
+	* Performance improvements for the Cobertura writer by reducing the amount
+	  of string operations
+
+	* Add a kcov-merge command which merges data from multiple kcov
+	  directories into a single report (Chris Love)
+
+	* Issue #39: Reduce the amount of extra output files by using filename
+	  as a tie breaker instead of file data.
+
+	* Issue #38: Fix several bugs which caused merged output to miss data
+	  present in the regular output
+
+	* Issue #37: Correct coverage accumulation for Python/bash
+
+	* Issue #36: Collect coverage from dlopen:ed libraries (through unconditional
+	  breakpoints in the dlopen call). Should also improve reliability of
+	  general shared library coverage collection
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Dec  2 20:42:04 CET 2014
+
+
+Kcov (22):
+	* Issue #35: Support installation RPATH for build (Chris Love)
+
+	* Issue #32: Fix problems when running Python unittest modules
+
+	* Various coverity resource leak fixes
+
+	* Peek into files to improve performance for matching (also see Issue #33)
+
+	* Break out solib handling from ptrace (not really related)
+
+	* Improve ptrace performance a bit, while also simplifying code
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Wed Oct 29 12:58:18 CET 2014
+
+Kcov (21):
+	* Fix regression for coverage-of-32-bit-binaries-on-64-bit-systems introduced
+	  in kcov 20
+
+	* Slightly better file stat caching (slight performance improvement)
+
+	* Avoid outputting merged cobertura output for single coverage runs
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Aug  7 20:00:20 CEST 2014
+
+Kcov (20):
+	* Issue #25: Fix starvation bug where long report generation time could starve
+	  the actual application. The bug was caused by a timestamp issue.
+
+	* Issue #18: Provide explanation and possible workaround for SIGILL problems
+	  with GCC 4.1.2
+
+	* Issue #23: Warn if a binary has no debug symbols
+
+	* Replace std::list/std::map with std::list/std::unordered_map where possible
+	  (slight performance improvement)
+
+	* Remove C++11 constructs (auto, nullptr, range-based for-loops) to allow
+	  building with older compilers
+
+	* Correct bug in --report-only (crash in ptrace upon termination)
+
+	* Slight performance improvement and simplification in the lineid code
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Aug  4 12:57:19 CEST 2014
+
+Kcov (19):
+	* bash coverage: Implemented support for collecting shell script
+	  (sh/bash) coverage! Loosely based on shcov, which is now deprecated
+	  because of this
+
+	* html-writer: Correct executable lines/covered lines in the summary
+	  (was wrong in some cases)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jun 30 18:30:37 CEST 2014
+
+Kcov (18):
+	* Performance: Improve performance by cacheing realpath()
+
+	* HTML: Always put merged results last and don't include them in sorting
+
+	* HTML: Coloring improvements (?) of the HTML output
+
+	* HTML: Refactor HTML output completely to use javascript-based pages.
+	  This allows selecting how to sort directly from the web page,
+	  and greatly simplifies the generating C++ code
+
+	* Correct filtering bug in the merged output, where the last
+	  run would filter out data from the previous runs
+
+	* Issue #20: Fix hanging-on-killed-by-signal
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jun  9 19:12:38 CEST 2014
+
+Kcov (17):
+	* Issue #19: Fix bug where kcov would let children which called
+	  setpgid live even after terminating kcov itself (Oliver)
+
+	* Issue #16: Output: Implement a merged mode, which shows a
+	  combination of all covered programs under the [merged] link
+
+	* Fix an HTML output bug introduced in kcov 14 where the summary
+	  counts in the index page would be wrong.
+
+	* Issue #15: Fix a crash when source lines are > ~2000 characters long
+
+	* Issue #17: Fix parsing of multiple include/exclude patterns
+	  (Jamie Kirkpatrick)
+
+	* Split usage in common/uncommon options
+
+	* Improve unit tests and robot framework tests
+
+	* Various work on the kernel-engine and general refactoring
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun May 18 19:24:14 CEST 2014
+
+Kcov (16):
+	* kernel-engine: Implement an engine to handle kernel code coverage
+	  collection (not finished)
+
+	* kprobe-coverage: Refactor the kernel module so that it basically
+	  works now
+
+	* Code refactoring and more C++11-izing
+
+	* Python: Filter out some false negatives (i.e., non-executable
+	  lines marked as red)
+
+	* Python: Report absolute paths so that output filtering works
+
+	* Python: Catch exceptions in the python helper to avoid EOF etc
+	  being propagated upwards (and coverage collection to fail)
+
+	* Python: Fix a case where the engine would simply hang on waiting
+	  for more data
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Mar 21 16:38:28 CET 2014
+
+
+Kcov (15):
+	* Workaround a shared-library issue where kcov would sometimes hang on
+	  the malloc. The workaround uses a static memory buffer instead.
+
+	* Implemented support for collecting Python code coverage! Usage is the
+	  same as for compiled code.
+
+	* Code-restructuring to allow multiple "engines", which makes it possible
+	  to add the python support above.
+
+	* More C++11-izing of the code
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Mar  2 10:50:00 CET 2014
+
+
+Kcov (14):
+	* Add two options, --collect-only and --report-only to only collect
+	  coverage and produce Cobertura/HTML output respectively. Can be
+	  used for example on embedded systems where the source code isn't
+	  available.
+
+	* PowerPC support has been added (thanks to Aleksandr Vilchinskii and
+	  Konstantin Polivtsev for testing this)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Wed Feb  5 19:42:03 CET 2014
+
+
+Kcov (13):
+	* Don't hang the kcov main process if a breakpoint comes in
+	  before the solib handler constructor has executed (depends on
+	  the construction order)
+
+	* Correct bug with realloc in solib handling (malloc all
+	  data once only)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Dec  8 19:34:37 CET 2013
+
+Kcov (12):
+	* Fix lockup bug in the solib code path (where processes with
+	  many solibs would hang at startup)
+
+	* Correct a crash in the reporter
+
+	* Add test case for signals
+
+	* Report from main thread to avoid threading issues
+	
+	* Fairly major refactoring of ptrace code to avoid an issue
+	  where two PTRACE_CONTINUE calls could be done without
+	  waitpid() in between. This would cause crashes in the
+	  traced program.
+
+	* Add support for looking for debug info in separate files
+	  via build-id (Alexander Larsson)
+
+	* Add --exit-first-process option to fork kcov when covering
+	  daemons (otherwise kcov will wait for all children to finish)
+
+	* Add --skip-solibs option to disable processing of shared
+	  libraries, which also works around a bug which sometimes
+	  triggers 
+
+	* Add --replace-source-path option for cases where the sources
+	  have been moved (James Warner)
+
+	* Fix linking (Igor Murzov) 
+
+	* Some build fixes to make it build with clang++
+
+	* Fix various warnings
+
+	* Add experimental profiler based on kcov
+
+	* Add sorting by reverse-percent (high -> low, -u option)
+
+	* Cache non-existing files to avoid doing lstat calls all the
+	  time (slight performance improvement)
+
+	* closedir() was not called from the html-writer, which creates
+	  a resource leak (Karl Vogel)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Oct 19 11:06:42 CEST 2013
+	
+
+Kcov (11):
+	* Fix handling of common paths in HTML writer
+
+	* Fix bug in shared library handling where repeated exec()s would
+	  cause strange hangs. Fixed by unsetting the KCOV_SOLIB_PATH environment
+	  variable after the first executable has been started.
+	  Add test-popen test case to check for this.
+
+	* Expand ~'s in the --include-path and --exclude-path options
+
+	* Unbreak accumulating data from multiple runs again (introduced
+	  sometime during refactoring), and add test case for this
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Aug 18 08:45:03 CEST 2012
+
+Kcov (10):
+	* Fix bug where multiple files with the same name would only be shown
+	  once in the HTML output.
+
+	* Fix icache conflict bug (present while instrumenting shared libraries)
+	  on multi-CPU systems by forcing all traced processes to one CPU
+
+	* Re-enable the --pid=PID argument to trace a running process again
+
+	* Fix race condition in the reporter
+
+	* Only set breakpoints in executable sections. This avoids problems where
+	  the DWARF line information points to non-code sections (which can happen)
+
+	* Fix coverage reporting of orphaned children (where the parent does not
+	  wait(2) for the child
+
+	* Use std::unordered_map for breakpoints (improves performance somewhat)
+
+	* Improve unit tests
+
+	* Add robot-framework testsuite that can be run from a Jenkins server
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jul 23 13:28:43 CEST 2012
+	
+Kcov (9):
+	* Completely refactor the source code (yes, everything!), and add
+	  unit tests to verify kcov itself. The code is now in C++.
+	  
+	* Implement transparent coverage instrumentation for shared libraries
+	  (done automatically)
+	  
+	* Implement a Cobertura-compatible XML backend. This allows integrating
+	  kcov coverage information in Jenkins.
+	  
+	* Improve performance a lot by filtering out files already at the
+	  instrumentation step (and not only during HTML generation). This
+	  means that --include-pattern/--include-path can improve kcov performance
+	  by quite a bit.
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jun 15 17:39:17 CEST 2012
+
+Kcov (8):
+	* Import the man-page from Debian and update it.
+
+	* Simplify parts of the ptrace code
+
+	* Correct the sorting of files-by-percentage when the difference
+	  is less than 0.5% (thanks Martin!).
+
+	* Correct the percentage-bar color according to the configured
+	  limits in the report.
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Dec  4 14:13:47 CET 2011
+
+Kcov (7):
+	* Weed out common parts of source paths from the report, display
+	  the full path as the HTML title= tag
+
+	* Fix crash bug in argument passing
+
+	* Handle hit count a bit better
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, 2011-07-10
+
+Kcov (6):
+	* Correct hit count. The hit count is no longer over the number of
+	  possible hits
+
+	* Better error reporting when stripped or otherwise broken binaries
+	  are passed to kcov
+
+	* Handle files with relative directory paths (lookup the absolute
+	  path via DWARF source files). Otherwise, some files are not reported
+	  in the output.
+
+	* Add test program to detect regressions
+
+	* Detect stripped binaries and report that you'll need to build
+	  with -g
+
+	* Correct --include/exclude-path behavior. The previous version
+	  will match PATH*/* instead of just PATH/* (Igor Murzov)
+	  
+	* Various small fixes 
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Apr 16 08:28:27 CEST 2011
+
+Kcov (5):
+	* Switch from libdwarf to libdw (from elfutils) for building
+	  kcov. libdw is a bit more logical than libdwarf.
+	  
+	* Implement actual path matching (Igor Murzov)
+
+	* Rename path-matching to pattern matching (which is what it does)
+	  and set it up using long options.
+
+	* Parse options with getopt
+
+	* Don't escape all multibyte characters in the report. That will
+	  break display of UTF-8 etc (Igor Murzov)
+
+	* Improve cmake packaging support (Igor Murzov)
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Feb 12 15:25:57 CET 2011
+
+Kcov (4):
+	* Build system is now based on cmake (Igor Murzov)
+
+	* Add MIPS32, ARM and PowerPC architecture support. This is untested though
+	  and might very well not work at all. 
+	  
+	* Add -t option to set the title of the program to test (otherwise it
+	  will be the filename) 
+
+	* Refactored the architecture support to allow running i386 programs
+	  on x86_64 machines, and easier add other architectures
+
+	* Make it possible to collect coverage from multiple programs in a
+	  single directory, useful for example when running a test suite
+
+	* Add coverage color to the header as well
+
+	* Misc refactoring  
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Dec  7 18:20:28 CET 2010
+
+Kcov (3):
+	* Various bug fixes
+
+	* Add ability to trace running processes by PID
+
+	* Fix copyright headers
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Nov 13 08:13:03 CET 2010
+
+Kcov (2):
+	* Misc fixes
+
+	* Add ability to specify low/high limits
+
+	* Add state saving between runs. Re-starting the same program
+	  will then add to existing coverage instead of starting from
+	  scratch.
+
+	* Link to web page in the report
+
+	* Add option to sort by percentage or file name
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Oct 24 09:15:39 CEST 2010
+
+Kcov (1):
+	* Initial release
+
+	-- Simon Kagstrom <simon.kagstrom@gmail.com>
diff --git a/kcov-38/Dockerfile b/kcov-38/Dockerfile
new file mode 100644
index 000000000000..e7eeee550b35
--- /dev/null
+++ b/kcov-38/Dockerfile
@@ -0,0 +1,40 @@
+FROM debian:stable-slim AS builder
+
+RUN apt-get update && \
+    apt-get install -y \
+        binutils-dev \
+        build-essential \
+        cmake \
+        git \
+        libcurl4-openssl-dev \
+        libdw-dev \
+        libiberty-dev \
+        ninja-build \
+        python3 \
+        zlib1g-dev \
+        ;
+
+ADD . /src/
+
+RUN mkdir /src/build && \
+    cd /src/build && \
+    cmake -G 'Ninja' .. && \
+    cmake --build . && \
+    cmake --build . --target install
+
+FROM debian:stable-slim
+
+RUN apt-get update && \
+    apt-get install -y \
+        binutils \
+        libcurl4 \
+        libdw1 \
+        zlib1g \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /usr/local/bin/kcov* /usr/local/bin/
+COPY --from=builder /usr/local/share/doc/kcov /usr/local/share/doc/kcov
+
+CMD ["/usr/local/bin/kcov"]
diff --git a/kcov-38/INSTALL.md b/kcov-38/INSTALL.md
new file mode 100644
index 000000000000..1de3f0f3f352
--- /dev/null
+++ b/kcov-38/INSTALL.md
@@ -0,0 +1,94 @@
+
+## *Building Kcov*
+
+Installing dependencies
+=======================
+You need development headers and libraries for libstdc++, curl, elfutils
+and (optional) binutils and libiberty to build kcov. Note that elfutils is
+found in multiple variants, and at least in RH/Centos/Fedora you'll need
+elfutils-devel and *not* elfutils-libelf-devel.
+
+FreeBSD
+-------
+pkg install binutils cmake elfutils python
+
+Ubuntu
+------
+Install binutils-dev libcurl4-openssl-dev zlib1g-dev libdw-dev libiberty-dev
+
+
+Fedora / Centos / RHEL
+----------------------
+Install elfutils-libelf-devel libcurl-devel binutils-devel elfutils-devel
+
+Mac OS X
+--------
+brew install zlib bash cmake pkgconfig
+
+*Temporary* OSX build instructions due to Issue #166:
+
+Create an empty build dir and do the following steps:
+
+```
+  cd <build-dir>
+  cmake -G Xcode <path/to/kcov/source/dir>
+  xcodebuild -target kcov -configuration Release
+```
+
+The binary will be `src/Release/kcov`
+
+Building
+========
+
+Create an empty build dir and do the following steps:
+
+    cmake [options] <path/to/kcov/source/dir>
+    make
+    make install
+
+Useful options include -DCMAKE_INSTALL_PREFIX=<path> (installation prefix),
+-DCMAKE_BUILD_TYPE=<type> and -DCMAKE_C_FLAGS=<CFLAGS>.
+
+Basic example:
+
+```
+    cd /path/to/kcov/source/dir
+    mkdir build
+    cd build
+    cmake ..
+    make
+    make install
+```
+
+More advanced example:
+
+```
+    cd /path/to/kcov/source/dir
+    mkdir build
+    cd build
+    cmake \
+      -DCMAKE_C_FLAGS:STRING="-O3 -march=i686" \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      ..
+    make -j2 || exit 1
+    make install DESTDIR=/tmp/kcov-build || exit 1
+```
+
+For further information refer to cmake documentation:
+    http://www.cmake.org/cmake/help/cmake-2-8-docs.html.
+
+
+Troubleshooting
+===============
+
+If you have elfutils installed, but cmake fails to find it, specify elfutils
+install prefix explicitly to cmake. Here is an example:
+
+```
+    cd kcov
+    CMAKE_PREFIX_PATH=/opt/elfutils-dir/ \
+    cmake .
+    make
+    make install
+```
diff --git a/kcov-38/README b/kcov-38/README
new file mode 120000
index 000000000000..42061c01a1c7
--- /dev/null
+++ b/kcov-38/README
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/kcov-38/README.md b/kcov-38/README.md
new file mode 100644
index 000000000000..21e4a289818f
--- /dev/null
+++ b/kcov-38/README.md
@@ -0,0 +1,96 @@
+[![Build Status](https://travis-ci.org/SimonKagstrom/kcov.svg?branch=master)](https://travis-ci.org/SimonKagstrom/kcov)
+[![Coveralls coverage status](https://img.shields.io/coveralls/SimonKagstrom/kcov.svg)](https://coveralls.io/r/SimonKagstrom/kcov?branch=master)
+[![Codecov coverage status](https://codecov.io/gh/SimonKagstrom/kcov/branch/master/graph/badge.svg)](https://codecov.io/gh/SimonKagstrom/kcov)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/2844/badge.svg)](https://scan.coverity.com/projects/2844)
+![Docker Build Status](https://img.shields.io/docker/build/kcov/kcov.svg)
+![MicroBadger Size](https://img.shields.io/microbadger/image-size/kcov/kcov.svg)
+![Docker Pulls](https://img.shields.io/docker/pulls/kcov/kcov.svg)
+
+[![PayPal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=simon.kagstrom%40gmail%2ecom&lc=US&item_name=Simon%20Kagstrom&item_number=kcov&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![Github All Releases](https://img.shields.io/github/downloads/atom/atom/total.svg)](https://github.com/SimonKagstrom/kcov/)
+
+## *kcov*
+Kcov is a FreeBSD/Linux/OSX code coverage tester for compiled languages, Python
+and Bash.  Kcov was originally a fork of [Bcov](http://bcov.sf.net), but has
+since evolved to support a large feature set in addition to that of Bcov.
+
+Kcov, like Bcov, uses DWARF debugging information for compiled programs to
+make it possible to collect coverage information without special compiler
+switches.
+
+For a video introduction, [look at this presentation from SwedenCPP](https://www.youtube.com/watch?v=1QMHbp5LUKg)
+
+Installing
+----------
+Refer to the [INSTALL](INSTALL.md) file for build instructions, or use our official Docker images:
+
+* [kcov/kcov](https://hub.docker.com/r/kcov/kcov/) for releases since v31.
+
+_Note:_
+
+_Tags v31-v33 are re-tags of [ragnaroek/kcov](https://hub.docker.com/r/ragnaroek/kcov/) which were not automated builds._
+
+_Tags v34-v35 are non automated builds using the Dockerfile in master with 1 minor [modification](https://github.com/SimonKagstrom/kcov/pull/274#issuecomment-432827976)._
+
+_Tag v36 is a non automated build using the Dockerfile in master._
+
+
+
+
+How to use it
+-------------
+Basic usage is straight-forward:
+
+```
+kcov /path/to/outdir executable [args for the executable]
+```
+
+*/path/to/outdir* will contain lcov-style HTML output generated
+continuously while the application runs. Kcov will also write cobertura-
+compatible XML output and can upload coverage data directly to
+http://coveralls.io for easy integration with travis-ci. A generic
+coverage.json report is also generated which contains summaries for a given
+binary and each source file.
+
+Filtering output
+----------------
+It's often useful to filter output, since e.g., /usr/include is seldom of interest.
+This can be done in two ways:
+
+```
+kcov --exclude-pattern=/usr/include --include-pattern=part/of/path,other/path \
+      /path/to/outdir executable
+```
+
+which will do a string-comparison and include everything which contains
+*part/of/path* or *other/path* but exclude everything that has the
+*/usr/include* string in it.
+
+```
+kcov --include-path=/my/src/path /path/to/outdir executable
+kcov --exclude-path=/usr/include /path/to/outdir executable
+```
+
+Does the same thing, but with proper path lookups.
+
+Use from continuous integration systems
+---------------------------------------
+kcov is easy to integrate with [travis-ci](http://travis-ci.org) together with
+[coveralls.io](http://coveralls.io) or [codecov.io](http://codecov.io). It can also
+be used from Jenkins, [SonarQube](http://sonarqube.org) and [GitLab CI](http://gitlab.com).
+Refer to
+
+* [coveralls](doc/coveralls.md) for details about travis-ci + coveralls, or
+* [codecov](doc/codecov.md) for details about travis-ci + codecov
+* [jenkins](doc/jenkins.md) for details about how to integrate in Jenkins
+* [sonarqube](doc/sonarqube.md) for how to use kcov and sonarqube together
+* [gitlab](doc/gitlab.md) for use with GitLab
+
+Full-system instrumentation
+---------------------------
+Kcov can instrument all binaries with very low overhead for embedded systems.
+Refer to the [full system instrumentation](doc/full-system-instrumentation.md) documentation for details.
+
+More information
+----------------
+kcov is written by Simon Kagstrom <simon.kagstrom@gmail.com> and more
+information can be found at [the web page](http://simonkagstrom.github.com/kcov/index.html)
diff --git a/kcov-38/cmake/FindBfd.cmake b/kcov-38/cmake/FindBfd.cmake
new file mode 100644
index 000000000000..7b588a8188d5
--- /dev/null
+++ b/kcov-38/cmake/FindBfd.cmake
@@ -0,0 +1,85 @@
+# - Try to find libbfd
+# Once done this will define
+#
+#  LIBBFD_FOUND - system has libbfd
+#  LIBBFD_INCLUDE_DIRS - the libbfd include directory
+#  LIBBFD_LIBRARIES - Link these to use libbfd
+#  LIBBFD_DEFINITIONS - Compiler switches required for using libbfd
+#
+# Based on:
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
+  set (LIBBFD_FIND_QUIETLY ON)
+endif (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
+
+find_path (LIBBFD_INCLUDE_DIRS
+    NAMES
+      bfd.h
+      dis-asm.h
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /opt/include
+      ENV CPATH)
+
+# Ugly, yes ugly...
+find_library (LIBBFD_BFD_LIBRARY
+    NAMES
+      bfd
+    PATHS
+      /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /usr/local/lib64
+      /opt/local/lib
+      /opt/usr/lib64
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+find_library (LIBBFD_IBERTY_LIBRARY
+    NAMES
+      iberty
+    PATHS
+      /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /usr/local/lib64
+      /opt/local/lib
+      /opt/usr/lib64
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+find_library (LIBBFD_OPCODES_LIBRARY
+    NAMES
+      opcodes
+    PATHS
+      /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /usr/local/lib64
+      /opt/local/lib
+      /opt/usr/lib64
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBBFD_FOUND to TRUE if all listed variables are TRUE
+find_package_handle_standard_args(LIBBFD DEFAULT_MSG
+    LIBBFD_BFD_LIBRARY
+    LIBBFD_IBERTY_LIBRARY
+    LIBBFD_OPCODES_LIBRARY
+    LIBBFD_INCLUDE_DIRS)
+
+mark_as_advanced(LIBBFD_INCLUDE_DIRS LIBBFD_LIBRARIES)
diff --git a/kcov-38/cmake/FindElfutils.cmake b/kcov-38/cmake/FindElfutils.cmake
new file mode 100644
index 000000000000..eefae5e3586a
--- /dev/null
+++ b/kcov-38/cmake/FindElfutils.cmake
@@ -0,0 +1,77 @@
+# - Try to find libdwarf
+# Once done this will define
+#
+#  LIBDWARF_FOUND - system has libdwarf
+#  LIBDWARF_INCLUDE_DIRS - the libdwarf include directory
+#  LIBDWARF_LIBRARIES - Link these to use libdwarf
+#  LIBDWARF_DEFINITIONS - Compiler switches required for using libdwarf
+#
+
+# Locate libelf library at first
+if (NOT LIBELF_FOUND)
+   find_package (LibElf)
+endif (NOT LIBELF_FOUND)
+
+if (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
+  set (LibDwarf_FIND_QUIETLY ON)
+endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
+
+find_package(PkgConfig QUIET)
+
+if(PKG_CONFIG_FOUND)
+  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
+  pkg_check_modules(PC_LIBDW QUIET libdw)
+endif()
+
+find_path (DWARF_INCLUDE_DIR
+    NAMES
+      dwarf.h
+    HINTS
+      ${PC_LIBDW_INCLUDE_DIRS}
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+      ENV CPATH) # PATH and INCLUDE will also work
+find_path (LIBDW_INCLUDE_DIR
+    NAMES
+      elfutils/libdw.h
+    HINTS
+      ${PC_LIBDW_INCLUDE_DIRS}
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+      ENV CPATH)
+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR)
+    set (LIBDWARF_INCLUDE_DIRS  ${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR)
+
+find_library (LIBDW_LIBRARY
+    NAMES
+      dw
+    HINTS
+      ${PC_LIBDW_LIBRARY_DIRS}
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+      ENV LIBRARY_PATH   # PATH and LIB will also work
+      ENV LD_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBDWARF_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(ElfUtils DEFAULT_MSG
+    LIBDW_LIBRARY
+    LIBDW_INCLUDE_DIR)
+
+mark_as_advanced(LIBDW_INCLUDE_DIR LIBDW_LIBRARY)
+
+set(LIBDW_LIBRARIES ${LIBDW_LIBRARY} )
+set(LIBDW_INCLUDE_DIRS ${LIBDW_INCLUDE_DIR} )
diff --git a/kcov-38/cmake/FindLibCRPCUT.cmake b/kcov-38/cmake/FindLibCRPCUT.cmake
new file mode 100644
index 000000000000..0cddba98953c
--- /dev/null
+++ b/kcov-38/cmake/FindLibCRPCUT.cmake
@@ -0,0 +1,59 @@
+# - Try to find libcrpcut
+# Once done this will define
+#
+#  LIBCRPCUT_FOUND - system has libcrpcut
+#  LIBCRPCUT_INCLUDE_DIRS - the libcrpcut include directory
+#  LIBCRPCUT_LIBRARIES - Link these to use libcrpcut
+#  LIBCRPCUT_DEFINITIONS - Compiler switches required for using libcrpcut
+#
+# Based on:
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (LIBCRPCUT_LIBRARIES AND LIBCRPCUT_INCLUDE_DIRS)
+  set (LibCRPCUT_FIND_QUIETLY ON)
+endif (LIBCRPCUT_LIBRARIES AND LIBCRPCUT_INCLUDE_DIRS)
+
+find_path (LIBCRPCUT_INCLUDE_DIRS
+    NAMES
+      crpcut.hpp
+    PATHS
+      /usr/include
+      /usr/include/crpcut
+      /usr/local/include
+      /usr/local/include/crpcut
+      /opt/local/include
+      /opt/local/include/crpcut
+      /home/ska/local/include
+      ENV CPATH)
+
+find_library (LIBCRPCUT_LIBRARIES
+    NAMES
+      crpcut
+    PATHS
+      /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /usr/local/lib64
+      /opt/local/lib
+      /opt/usr/lib64
+      /home/ska/local/lib
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBCRPCUT_FOUND to TRUE if all listed variables are TRUE
+find_package_handle_standard_args(LibCRPCUT DEFAULT_MSG
+    LIBCRPCUT_LIBRARIES
+    LIBCRPCUT_INCLUDE_DIRS)
+
+
+mark_as_advanced(LIBCRPCUT_INCLUDE_DIRS LIBCRPCUT_LIBRARIES)
diff --git a/kcov-38/cmake/FindLibElf.cmake b/kcov-38/cmake/FindLibElf.cmake
new file mode 100644
index 000000000000..c1c1901d4dbc
--- /dev/null
+++ b/kcov-38/cmake/FindLibElf.cmake
@@ -0,0 +1,68 @@
+# - Try to find libelf
+# Once done this will define
+#
+#  LIBELF_FOUND - system has libelf
+#  LIBELF_INCLUDE_DIRS - the libelf include directory
+#  LIBELF_LIBRARIES - Link these to use libelf
+#  LIBELF_DEFINITIONS - Compiler switches required for using libelf
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+if (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
+  set (LibElf_FIND_QUIETLY ON)
+endif (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
+
+find_package(PkgConfig QUIET)
+
+if(PKG_CONFIG_FOUND)
+  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
+  pkg_check_modules(PC_LIBELF QUIET libelf)
+endif()
+
+find_path (LIBELF_INCLUDE_DIR
+    NAMES
+      libelf.h
+    HINTS
+      ${PC_LIBELF_INCLUDE_DIRS}
+    PATHS
+      /usr/include
+      /usr/include/libelf
+      /usr/local/include
+      /usr/local/include/libelf
+      /opt/local/include
+      /opt/local/include/libelf
+      /sw/include
+      /sw/include/libelf
+      ENV CPATH)
+
+find_library (LIBELF_LIBRARY
+    NAMES
+      elf
+    HINTS
+      ${PC_LIBELF_LIBRARY_DIRS}
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+      ENV LIBRARY_PATH
+      ENV LD_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBELF_FOUND to TRUE if all listed variables are TRUE
+find_package_handle_standard_args(LibElf DEFAULT_MSG
+    LIBELF_LIBRARY
+    LIBELF_INCLUDE_DIR)
+
+
+mark_as_advanced(LIBELF_INCLUDE_DIR LIBELF_LIBRARY)
+
+set(LIBELF_LIBRARIES ${LIBELF_LIBRARY} )
+set(LIBELF_INCLUDE_DIRS ${LIBELF_INCLUDE_DIR} )
diff --git a/kcov-38/cmake/TargetArch.cmake b/kcov-38/cmake/TargetArch.cmake
new file mode 100644
index 000000000000..46e17557be33
--- /dev/null
+++ b/kcov-38/cmake/TargetArch.cmake
@@ -0,0 +1,134 @@
+# Based on the Qt 5 processor detection code, so should be very accurate
+# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
+# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
+
+# Regarding POWER/PowerPC, just as is noted in the Qt source,
+# "There are many more known variants/revisions that we do not handle/detect."
+
+set(archdetect_c_code "
+#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
+    #if defined(__ARM_ARCH_7__) \\
+        || defined(__ARM_ARCH_7A__) \\
+        || defined(__ARM_ARCH_7R__) \\
+        || defined(__ARM_ARCH_7M__) \\
+        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
+        #error cmake_ARCH armv7
+    #elif defined(__ARM_ARCH_6__) \\
+        || defined(__ARM_ARCH_6J__) \\
+        || defined(__ARM_ARCH_6T2__) \\
+        || defined(__ARM_ARCH_6Z__) \\
+        || defined(__ARM_ARCH_6K__) \\
+        || defined(__ARM_ARCH_6ZK__) \\
+        || defined(__ARM_ARCH_6M__) \\
+        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
+        #error cmake_ARCH armv6
+    #elif defined(__ARM_ARCH_5TEJ__) \\
+        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
+        #error cmake_ARCH armv5
+    #else
+        #error cmake_ARCH arm
+    #endif
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+    #error cmake_ARCH i386
+#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+    #error cmake_ARCH x86_64
+#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+    #error cmake_ARCH ia64
+#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
+      || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \\
+      || defined(_M_MPPC) || defined(_M_PPC)
+    #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
+        #error cmake_ARCH ppc64
+    #else
+        #error cmake_ARCH ppc
+    #endif
+#endif
+
+#error cmake_ARCH unknown
+")
+
+# Set ppc_support to TRUE before including this file or ppc and ppc64
+# will be treated as invalid architectures since they are no longer supported by Apple
+
+function(target_architecture output_var)
+    if(APPLE AND CMAKE_OSX_ARCHITECTURES)
+        # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
+        # First let's normalize the order of the values
+
+        # Note that it's not possible to compile PowerPC applications if you are using
+        # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
+        # disable it by default
+        # See this page for more information:
+        # http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
+
+        # Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
+        # On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
+
+        foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
+            if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
+                set(osx_arch_ppc ON)
+            elseif("${osx_arch}" STREQUAL "i386")
+                set(osx_arch_i386 ON)
+            elseif("${osx_arch}" STREQUAL "x86_64")
+                set(osx_arch_x86_64 ON)
+            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
+                set(osx_arch_ppc64 ON)
+            else()
+                message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
+            endif()
+        endforeach()
+
+        # Now add all the architectures in our normalized order
+        if(osx_arch_ppc)
+            list(APPEND ARCH ppc)
+        endif()
+
+        if(osx_arch_i386)
+            list(APPEND ARCH i386)
+        endif()
+
+        if(osx_arch_x86_64)
+            list(APPEND ARCH x86_64)
+        endif()
+
+        if(osx_arch_ppc64)
+            list(APPEND ARCH ppc64)
+        endif()
+    else()
+        file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
+
+        enable_language(C)
+
+        # Detect the architecture in a rather creative way...
+        # This compiles a small C program which is a series of ifdefs that selects a
+        # particular #error preprocessor directive whose message string contains the
+        # target architecture. The program will always fail to compile (both because
+        # file is not a valid C program, and obviously because of the presence of the
+        # #error preprocessor directives... but by exploiting the preprocessor in this
+        # way, we can detect the correct target architecture even when cross-compiling,
+        # since the program itself never needs to be run (only the compiler/preprocessor)
+        try_run(
+            run_result_unused
+            compile_result_unused
+            "${CMAKE_BINARY_DIR}"
+            "${CMAKE_BINARY_DIR}/arch.c"
+            COMPILE_OUTPUT_VARIABLE ARCH
+            CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        )
+
+        # Parse the architecture name from the compiler output
+        string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
+
+        # Get rid of the value marker leaving just the architecture name
+        string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
+
+        # If we are compiling with an unknown architecture this variable should
+        # already be set to "unknown" but in the case that it's empty (i.e. due
+        # to a typo in the code), then set it to unknown
+        if (NOT ARCH)
+            set(ARCH unknown)
+        endif()
+    endif()
+
+    set(${output_var} "${ARCH}" PARENT_SCOPE)
+endfunction()
diff --git a/kcov-38/data/amber.png b/kcov-38/data/amber.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cab170d8359081983a4e343848dfe06bc490f12
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^G2tW}LqE04T&+
z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1M1^9%x{(levWG<?@RR^TFJY5_^
cDsCkw0NG3oj8E0?f%GwWy85}Sb4q9e09Jz{aR2}S

literal 0
HcmV?d00001

diff --git a/kcov-38/data/bcov.css b/kcov-38/data/bcov.css
new file mode 100644
index 000000000000..ea9ff66a6fd0
--- /dev/null
+++ b/kcov-38/data/bcov.css
@@ -0,0 +1,32 @@
+/* Based upon the lcov CSS style, style files can be reused */
+body { color: #000000; background-color: #FFFFFF; }
+a:link { color: #284FA8; text-decoration: underline; }
+a:visited { color: #00CB40; text-decoration: underline; }
+a:active { color: #FF0040; text-decoration: underline; }
+td.title { text-align: center; padding-bottom: 10px; font-size: 20pt; font-weight: bold; }
+td.ruler { background-color: #6688D4; }
+td.headerItem { text-align: right; padding-right: 6px; font-family: sans-serif; font-weight: bold; }
+td.headerValue { text-align: left; color: #284FA8; font-family: sans-serif; font-weight: bold; }
+td.versionInfo { text-align: center; padding-top:  2px; }
+th.headerItem { text-align: right; padding-right: 6px; font-family: sans-serif; font-weight: bold; }
+th.headerValue { text-align: left; color: #284FA8; font-family: sans-serif; font-weight: bold; }
+pre.source { font-family: monospace; white-space: pre; overflow: hidden; text-overflow: ellipsis; }
+span.lineNum { background-color: #EFE383; }
+span.lineNumLegend { background-color: #EFE383; width: 96px; font-weight: bold ;}
+span.lineCov { background-color: #adff9a; }
+span.linePartCov { background-color: #fffe80; }
+span.lineNoCov { background-color: #ffbbbb; }
+span.orderNum { background-color: #e0b373; float: right; width:5em; text-align: left; }
+span.orderNumLegend { background-color: #e0b373; width: 96px; font-weight: bold ;}
+span.coverHits { background-color: #DFE383;  padding-left: 3px; padding-right: 1px;  text-align: right; list-style-type: none; display: inline-block; width: 5em; }
+span.coverHitsLegend { background-color: #DFE383; width: 96px; font-weight: bold; margin: 0 auto;}
+td.tableHead { text-align: center; color: #FFFFFF; background-color: #6688D4; font-family: sans-serif; font-size: 120%; font-weight: bold; }
+td.coverFile { text-align: left; padding-left: 10px; padding-right: 20px; color: #284FA8; font-family: monospace; }
+td.coverBar { padding-left: 10px; padding-right: 10px; background-color: #DAE7FE; }
+td.coverBarOutline { background-color: #000000; }
+td.coverPer { text-align: left; padding-left: 10px; padding-right: 10px; font-weight: bold; }
+td.coverPerLeftMed { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #fffe80; font-weight: bold; }
+td.coverPerLeftLo { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #ffbbbb; font-weight: bold; }
+td.coverPerLeftHi { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #adff9a; font-weight: bold; }
+td.coverNum { text-align: right; padding-left: 10px; padding-right: 10px; }
+td.coverNum { text-align: right; padding-left: 10px; padding-right: 10px; }
diff --git a/kcov-38/data/glass.png b/kcov-38/data/glass.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1abc00680a3093c49fdb775ae6bdb6764c95af2
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6;R0X`wF
z|Ns97GD8ntt^-nxB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gf+eGhVt|_XjA*
zUgGKN%6^Gmn4d%Ph(nkFP>9RZ#WAE}PI3Z}&BVayv3^M*kj3EX>gTe~DWM4f=_Dpv

literal 0
HcmV?d00001

diff --git a/kcov-38/data/index.html b/kcov-38/data/index.html
new file mode 100644
index 000000000000..9611abb0ad7a
--- /dev/null
+++ b/kcov-38/data/index.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title id="window-title">???</title>
+  <link rel="stylesheet" href="data/tablesorter-theme.css">
+  <link rel="stylesheet" type="text/css" href="data/bcov.css"/>
+</head>
+
+<noscript>
+<font color=red><B>ERROR:</B></font> JavaScript need to be enabled for the coverage report to work.
+</noscript>
+
+<script type="text/javascript" src="index.js"></script>
+<script type="text/javascript" src="data/js/jquery.min.js"></script>
+<script type="text/javascript" src="data/js/tablesorter.min.js"></script>
+<script type="text/javascript" src="data/js/jquery.tablesorter.widgets.min.js"></script>
+<script type="text/javascript" src="data/js/handlebars.js"></script>
+<script type="text/javascript" src="data/js/kcov.js"></script>
+<body>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+  <tr><td class="title">Coverage Report</td></tr>
+  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
+  <tr>
+    <td width="100%">
+      <table cellpadding="1" border="0" width="100%">
+        <tr id="command">
+          <td class="headerItem" width="20%">Command:</td>
+          <td id="header-command" class="headerValue" width="80%" colspan=6>???</td>
+        </tr>
+        <tr>
+          <td class="headerItem" width="20%">Date: </td>
+          <td id="header-date" class="headerValue" width="15%"></td>
+          <td width="5%"></td>
+          <td class="headerItem" width="20%">Instrumented lines:</td>
+          <td id="header-instrumented" class="headerValue" width="10%">???</td>
+        </tr>
+        <tr>
+          <td class="headerItem" width="20%">Code covered:</td>
+          <td id="header-percent-covered" width="15%">???</td>
+          <td width="5%"></td>
+          <td class="headerItem" width="20%">Executed lines:</td>
+          <td id="header-covered" class="headerValue" width="10%">???</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
+</table>
+
+
+<script id="files-template" type="text/x-handlebars-template">
+<center>
+  <table width="80%" cellpadding="2" cellspacing="1" border="0" id="index-table" class="tablesorter">
+    <thead>
+    <tr>
+      <th class="tableHead" width="50%">Filename</th>
+      <th width="20%">Coverage percent</th>
+      <th width="10%">Covered lines</th>
+      <th width="10%">Uncovered lines</th>
+      <th width="10%">Executable lines</th>
+    </tr>
+    </thead>
+    <tbody id="main-data">
+    {{#each files}}
+    <tr>
+      <td class="coverFile"><a href="{{link}}" title="{{title}}">{{summary_name}}</a></td>
+      <td class="coverPer"><span style="display:block;width:{{covered}}%" class="{{covered_class}}">{{covered}}%</td>
+      <td class="coverNum">{{covered_lines}}</td>
+      <td class="coverNum">{{uncovered_lines}}</td>
+      <td class="coverNum">{{total_lines}}</td>
+    </tr>
+    {{/each}}
+    </tbody>
+    {{#each merged_files}}
+    <tbody tablesorter-no-sort id="merged-data">
+    <tr>
+      <td class="coverFile"><a href="{{link}}" title="{{title}}">{{summary_name}}</a></td>
+      <td class="coverPer"><span style="display:block;width:{{covered}}%" class="{{covered_class}}">{{covered}}%</td>
+      <td class="coverNum">{{covered_lines}}</td>
+      <td class="coverNum">{{uncovered_lines}}</td>
+      <td class="coverNum">{{total_lines}}</td>
+    </tr>
+    </tbody>
+    {{/each}}
+  </table>
+</center>
+</script>
+<div id="files-placeholder"></div>
+
+<br>
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+  <tr><td class="ruler"><img src="data/amber.png" width="3" height="3" alt=""/></td></tr>
+  <tr><td class="versionInfo">Generated by: <a href="http://simonkagstrom.github.com/kcov/index.html">Kcov</a></td></tr>
+</table>
+</body>
+</html>
diff --git a/kcov-38/data/js/handlebars.js b/kcov-38/data/js/handlebars.js
new file mode 100644
index 000000000000..1f7d2654a724
--- /dev/null
+++ b/kcov-38/data/js/handlebars.js
@@ -0,0 +1,3079 @@
+/*!
+
+ handlebars v2.0.0
+
+Copyright (C) 2011-2014 by Yehuda Katz
+
+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.
+
+@license
+*/
+/* exported Handlebars */
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
+  } else {
+    root.Handlebars = root.Handlebars || factory();
+  }
+}(this, function () {
+// handlebars/safe-string.js
+var __module4__ = (function() {
+  "use strict";
+  var __exports__;
+  // Build out our basic SafeString type
+  function SafeString(string) {
+    this.string = string;
+  }
+
+  SafeString.prototype.toString = function() {
+    return "" + this.string;
+  };
+
+  __exports__ = SafeString;
+  return __exports__;
+})();
+
+// handlebars/utils.js
+var __module3__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  /*jshint -W004 */
+  var SafeString = __dependency1__;
+
+  var escape = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#x27;",
+    "`": "&#x60;"
+  };
+
+  var badChars = /[&<>"'`]/g;
+  var possible = /[&<>"'`]/;
+
+  function escapeChar(chr) {
+    return escape[chr];
+  }
+
+  function extend(obj /* , ...source */) {
+    for (var i = 1; i < arguments.length; i++) {
+      for (var key in arguments[i]) {
+        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+          obj[key] = arguments[i][key];
+        }
+      }
+    }
+
+    return obj;
+  }
+
+  __exports__.extend = extend;var toString = Object.prototype.toString;
+  __exports__.toString = toString;
+  // Sourced from lodash
+  // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
+  var isFunction = function(value) {
+    return typeof value === 'function';
+  };
+  // fallback for older versions of Chrome and Safari
+  /* istanbul ignore next */
+  if (isFunction(/x/)) {
+    isFunction = function(value) {
+      return typeof value === 'function' && toString.call(value) === '[object Function]';
+    };
+  }
+  var isFunction;
+  __exports__.isFunction = isFunction;
+  /* istanbul ignore next */
+  var isArray = Array.isArray || function(value) {
+    return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
+  };
+  __exports__.isArray = isArray;
+
+  function escapeExpression(string) {
+    // don't escape SafeStrings, since they're already safe
+    if (string instanceof SafeString) {
+      return string.toString();
+    } else if (string == null) {
+      return "";
+    } else if (!string) {
+      return string + '';
+    }
+
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = "" + string;
+
+    if(!possible.test(string)) { return string; }
+    return string.replace(badChars, escapeChar);
+  }
+
+  __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
+    if (!value && value !== 0) {
+      return true;
+    } else if (isArray(value) && value.length === 0) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) {
+    return (contextPath ? contextPath + '.' : '') + id;
+  }
+
+  __exports__.appendContextPath = appendContextPath;
+  return __exports__;
+})(__module4__);
+
+// handlebars/exception.js
+var __module5__ = (function() {
+  "use strict";
+  var __exports__;
+
+  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+  function Exception(message, node) {
+    var line;
+    if (node && node.firstLine) {
+      line = node.firstLine;
+
+      message += ' - ' + line + ':' + node.firstColumn;
+    }
+
+    var tmp = Error.prototype.constructor.call(this, message);
+
+    // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+    for (var idx = 0; idx < errorProps.length; idx++) {
+      this[errorProps[idx]] = tmp[errorProps[idx]];
+    }
+
+    if (line) {
+      this.lineNumber = line;
+      this.column = node.firstColumn;
+    }
+  }
+
+  Exception.prototype = new Error();
+
+  __exports__ = Exception;
+  return __exports__;
+})();
+
+// handlebars/base.js
+var __module2__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__ = {};
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+
+  var VERSION = "2.0.0";
+  __exports__.VERSION = VERSION;var COMPILER_REVISION = 6;
+  __exports__.COMPILER_REVISION = COMPILER_REVISION;
+  var REVISION_CHANGES = {
+    1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+    2: '== 1.0.0-rc.3',
+    3: '== 1.0.0-rc.4',
+    4: '== 1.x.x',
+    5: '== 2.0.0-alpha.x',
+    6: '>= 2.0.0-beta.1'
+  };
+  __exports__.REVISION_CHANGES = REVISION_CHANGES;
+  var isArray = Utils.isArray,
+      isFunction = Utils.isFunction,
+      toString = Utils.toString,
+      objectType = '[object Object]';
+
+  function HandlebarsEnvironment(helpers, partials) {
+    this.helpers = helpers || {};
+    this.partials = partials || {};
+
+    registerDefaultHelpers(this);
+  }
+
+  __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
+    constructor: HandlebarsEnvironment,
+
+    logger: logger,
+    log: log,
+
+    registerHelper: function(name, fn) {
+      if (toString.call(name) === objectType) {
+        if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
+        Utils.extend(this.helpers, name);
+      } else {
+        this.helpers[name] = fn;
+      }
+    },
+    unregisterHelper: function(name) {
+      delete this.helpers[name];
+    },
+
+    registerPartial: function(name, partial) {
+      if (toString.call(name) === objectType) {
+        Utils.extend(this.partials,  name);
+      } else {
+        this.partials[name] = partial;
+      }
+    },
+    unregisterPartial: function(name) {
+      delete this.partials[name];
+    }
+  };
+
+  function registerDefaultHelpers(instance) {
+    instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+      if(arguments.length === 1) {
+        // A missing field in a {{foo}} constuct.
+        return undefined;
+      } else {
+        // Someone is actually trying to call something, blow up.
+        throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
+      }
+    });
+
+    instance.registerHelper('blockHelperMissing', function(context, options) {
+      var inverse = options.inverse,
+          fn = options.fn;
+
+      if(context === true) {
+        return fn(this);
+      } else if(context === false || context == null) {
+        return inverse(this);
+      } else if (isArray(context)) {
+        if(context.length > 0) {
+          if (options.ids) {
+            options.ids = [options.name];
+          }
+
+          return instance.helpers.each(context, options);
+        } else {
+          return inverse(this);
+        }
+      } else {
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
+          options = {data: data};
+        }
+
+        return fn(context, options);
+      }
+    });
+
+    instance.registerHelper('each', function(context, options) {
+      if (!options) {
+        throw new Exception('Must pass iterator to #each');
+      }
+
+      var fn = options.fn, inverse = options.inverse;
+      var i = 0, ret = "", data;
+
+      var contextPath;
+      if (options.data && options.ids) {
+        contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
+      }
+
+      if (isFunction(context)) { context = context.call(this); }
+
+      if (options.data) {
+        data = createFrame(options.data);
+      }
+
+      if(context && typeof context === 'object') {
+        if (isArray(context)) {
+          for(var j = context.length; i<j; i++) {
+            if (data) {
+              data.index = i;
+              data.first = (i === 0);
+              data.last  = (i === (context.length-1));
+
+              if (contextPath) {
+                data.contextPath = contextPath + i;
+              }
+            }
+            ret = ret + fn(context[i], { data: data });
+          }
+        } else {
+          for(var key in context) {
+            if(context.hasOwnProperty(key)) {
+              if(data) {
+                data.key = key;
+                data.index = i;
+                data.first = (i === 0);
+
+                if (contextPath) {
+                  data.contextPath = contextPath + key;
+                }
+              }
+              ret = ret + fn(context[key], {data: data});
+              i++;
+            }
+          }
+        }
+      }
+
+      if(i === 0){
+        ret = inverse(this);
+      }
+
+      return ret;
+    });
+
+    instance.registerHelper('if', function(conditional, options) {
+      if (isFunction(conditional)) { conditional = conditional.call(this); }
+
+      // Default behavior is to render the positive path if the value is truthy and not empty.
+      // The `includeZero` option may be set to treat the conditional as purely not empty based on the
+      // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+      if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+        return options.inverse(this);
+      } else {
+        return options.fn(this);
+      }
+    });
+
+    instance.registerHelper('unless', function(conditional, options) {
+      return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+    });
+
+    instance.registerHelper('with', function(context, options) {
+      if (isFunction(context)) { context = context.call(this); }
+
+      var fn = options.fn;
+
+      if (!Utils.isEmpty(context)) {
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
+          options = {data:data};
+        }
+
+        return fn(context, options);
+      } else {
+        return options.inverse(this);
+      }
+    });
+
+    instance.registerHelper('log', function(message, options) {
+      var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+      instance.log(level, message);
+    });
+
+    instance.registerHelper('lookup', function(obj, field) {
+      return obj && obj[field];
+    });
+  }
+
+  var logger = {
+    methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+    // State enum
+    DEBUG: 0,
+    INFO: 1,
+    WARN: 2,
+    ERROR: 3,
+    level: 3,
+
+    // can be overridden in the host environment
+    log: function(level, message) {
+      if (logger.level <= level) {
+        var method = logger.methodMap[level];
+        if (typeof console !== 'undefined' && console[method]) {
+          console[method].call(console, message);
+        }
+      }
+    }
+  };
+  __exports__.logger = logger;
+  var log = logger.log;
+  __exports__.log = log;
+  var createFrame = function(object) {
+    var frame = Utils.extend({}, object);
+    frame._parent = object;
+    return frame;
+  };
+  __exports__.createFrame = createFrame;
+  return __exports__;
+})(__module3__, __module5__);
+
+// handlebars/runtime.js
+var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
+  "use strict";
+  var __exports__ = {};
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+  var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
+  var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+  var createFrame = __dependency3__.createFrame;
+
+  function checkRevision(compilerInfo) {
+    var compilerRevision = compilerInfo && compilerInfo[0] || 1,
+        currentRevision = COMPILER_REVISION;
+
+    if (compilerRevision !== currentRevision) {
+      if (compilerRevision < currentRevision) {
+        var runtimeVersions = REVISION_CHANGES[currentRevision],
+            compilerVersions = REVISION_CHANGES[compilerRevision];
+        throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
+              "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+      } else {
+        // Use the embedded version info since the runtime doesn't know about this revision yet
+        throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+              "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+      }
+    }
+  }
+
+  __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
+
+  function template(templateSpec, env) {
+    /* istanbul ignore next */
+    if (!env) {
+      throw new Exception("No environment passed to template");
+    }
+    if (!templateSpec || !templateSpec.main) {
+      throw new Exception('Unknown template object: ' + typeof templateSpec);
+    }
+
+    // Note: Using env.VM references rather than local var references throughout this section to allow
+    // for external users to override these as pseudo-supported APIs.
+    env.VM.checkRevision(templateSpec.compiler);
+
+    var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
+      if (hash) {
+        context = Utils.extend({}, context, hash);
+      }
+
+      var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
+
+      if (result == null && env.compile) {
+        var options = { helpers: helpers, partials: partials, data: data, depths: depths };
+        partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
+        result = partials[name](context, options);
+      }
+      if (result != null) {
+        if (indent) {
+          var lines = result.split('\n');
+          for (var i = 0, l = lines.length; i < l; i++) {
+            if (!lines[i] && i + 1 === l) {
+              break;
+            }
+
+            lines[i] = indent + lines[i];
+          }
+          result = lines.join('\n');
+        }
+        return result;
+      } else {
+        throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
+      }
+    };
+
+    // Just add water
+    var container = {
+      lookup: function(depths, name) {
+        var len = depths.length;
+        for (var i = 0; i < len; i++) {
+          if (depths[i] && depths[i][name] != null) {
+            return depths[i][name];
+          }
+        }
+      },
+      lambda: function(current, context) {
+        return typeof current === 'function' ? current.call(context) : current;
+      },
+
+      escapeExpression: Utils.escapeExpression,
+      invokePartial: invokePartialWrapper,
+
+      fn: function(i) {
+        return templateSpec[i];
+      },
+
+      programs: [],
+      program: function(i, data, depths) {
+        var programWrapper = this.programs[i],
+            fn = this.fn(i);
+        if (data || depths) {
+          programWrapper = program(this, i, fn, data, depths);
+        } else if (!programWrapper) {
+          programWrapper = this.programs[i] = program(this, i, fn);
+        }
+        return programWrapper;
+      },
+
+      data: function(data, depth) {
+        while (data && depth--) {
+          data = data._parent;
+        }
+        return data;
+      },
+      merge: function(param, common) {
+        var ret = param || common;
+
+        if (param && common && (param !== common)) {
+          ret = Utils.extend({}, common, param);
+        }
+
+        return ret;
+      },
+
+      noop: env.VM.noop,
+      compilerInfo: templateSpec.compiler
+    };
+
+    var ret = function(context, options) {
+      options = options || {};
+      var data = options.data;
+
+      ret._setup(options);
+      if (!options.partial && templateSpec.useData) {
+        data = initData(context, data);
+      }
+      var depths;
+      if (templateSpec.useDepths) {
+        depths = options.depths ? [context].concat(options.depths) : [context];
+      }
+
+      return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
+    };
+    ret.isTop = true;
+
+    ret._setup = function(options) {
+      if (!options.partial) {
+        container.helpers = container.merge(options.helpers, env.helpers);
+
+        if (templateSpec.usePartial) {
+          container.partials = container.merge(options.partials, env.partials);
+        }
+      } else {
+        container.helpers = options.helpers;
+        container.partials = options.partials;
+      }
+    };
+
+    ret._child = function(i, data, depths) {
+      if (templateSpec.useDepths && !depths) {
+        throw new Exception('must pass parent depths');
+      }
+
+      return program(container, i, templateSpec[i], data, depths);
+    };
+    return ret;
+  }
+
+  __exports__.template = template;function program(container, i, fn, data, depths) {
+    var prog = function(context, options) {
+      options = options || {};
+
+      return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
+    };
+    prog.program = i;
+    prog.depth = depths ? depths.length : 0;
+    return prog;
+  }
+
+  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data, depths) {
+    var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
+
+    if(partial === undefined) {
+      throw new Exception("The partial " + name + " could not be found");
+    } else if(partial instanceof Function) {
+      return partial(context, options);
+    }
+  }
+
+  __exports__.invokePartial = invokePartial;function noop() { return ""; }
+
+  __exports__.noop = noop;function initData(context, data) {
+    if (!data || !('root' in data)) {
+      data = data ? createFrame(data) : {};
+      data.root = context;
+    }
+    return data;
+  }
+  return __exports__;
+})(__module3__, __module5__, __module2__);
+
+// handlebars.runtime.js
+var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  "use strict";
+  var __exports__;
+  /*globals Handlebars: true */
+  var base = __dependency1__;
+
+  // Each of these augment the Handlebars object. No need to setup here.
+  // (This is done to easily share code between commonjs and browse envs)
+  var SafeString = __dependency2__;
+  var Exception = __dependency3__;
+  var Utils = __dependency4__;
+  var runtime = __dependency5__;
+
+  // For compatibility and usage outside of module systems, make the Handlebars object a namespace
+  var create = function() {
+    var hb = new base.HandlebarsEnvironment();
+
+    Utils.extend(hb, base);
+    hb.SafeString = SafeString;
+    hb.Exception = Exception;
+    hb.Utils = Utils;
+    hb.escapeExpression = Utils.escapeExpression;
+
+    hb.VM = runtime;
+    hb.template = function(spec) {
+      return runtime.template(spec, hb);
+    };
+
+    return hb;
+  };
+
+  var Handlebars = create();
+  Handlebars.create = create;
+
+  Handlebars['default'] = Handlebars;
+
+  __exports__ = Handlebars;
+  return __exports__;
+})(__module2__, __module4__, __module5__, __module3__, __module6__);
+
+// handlebars/compiler/ast.js
+var __module7__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__;
+  var Exception = __dependency1__;
+
+  function LocationInfo(locInfo) {
+    locInfo = locInfo || {};
+    this.firstLine   = locInfo.first_line;
+    this.firstColumn = locInfo.first_column;
+    this.lastColumn  = locInfo.last_column;
+    this.lastLine    = locInfo.last_line;
+  }
+
+  var AST = {
+    ProgramNode: function(statements, strip, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "program";
+      this.statements = statements;
+      this.strip = strip;
+    },
+
+    MustacheNode: function(rawParams, hash, open, strip, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "mustache";
+      this.strip = strip;
+
+      // Open may be a string parsed from the parser or a passed boolean flag
+      if (open != null && open.charAt) {
+        // Must use charAt to support IE pre-10
+        var escapeFlag = open.charAt(3) || open.charAt(2);
+        this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
+      } else {
+        this.escaped = !!open;
+      }
+
+      if (rawParams instanceof AST.SexprNode) {
+        this.sexpr = rawParams;
+      } else {
+        // Support old AST API
+        this.sexpr = new AST.SexprNode(rawParams, hash);
+      }
+
+      // Support old AST API that stored this info in MustacheNode
+      this.id = this.sexpr.id;
+      this.params = this.sexpr.params;
+      this.hash = this.sexpr.hash;
+      this.eligibleHelper = this.sexpr.eligibleHelper;
+      this.isHelper = this.sexpr.isHelper;
+    },
+
+    SexprNode: function(rawParams, hash, locInfo) {
+      LocationInfo.call(this, locInfo);
+
+      this.type = "sexpr";
+      this.hash = hash;
+
+      var id = this.id = rawParams[0];
+      var params = this.params = rawParams.slice(1);
+
+      // a mustache is definitely a helper if:
+      // * it is an eligible helper, and
+      // * it has at least one parameter or hash segment
+      this.isHelper = !!(params.length || hash);
+
+      // a mustache is an eligible helper if:
+      // * its id is simple (a single part, not `this` or `..`)
+      this.eligibleHelper = this.isHelper || id.isSimple;
+
+      // if a mustache is an eligible helper but not a definite
+      // helper, it is ambiguous, and will be resolved in a later
+      // pass or at runtime.
+    },
+
+    PartialNode: function(partialName, context, hash, strip, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type         = "partial";
+      this.partialName  = partialName;
+      this.context      = context;
+      this.hash = hash;
+      this.strip = strip;
+
+      this.strip.inlineStandalone = true;
+    },
+
+    BlockNode: function(mustache, program, inverse, strip, locInfo) {
+      LocationInfo.call(this, locInfo);
+
+      this.type = 'block';
+      this.mustache = mustache;
+      this.program  = program;
+      this.inverse  = inverse;
+      this.strip = strip;
+
+      if (inverse && !program) {
+        this.isInverse = true;
+      }
+    },
+
+    RawBlockNode: function(mustache, content, close, locInfo) {
+      LocationInfo.call(this, locInfo);
+
+      if (mustache.sexpr.id.original !== close) {
+        throw new Exception(mustache.sexpr.id.original + " doesn't match " + close, this);
+      }
+
+      content = new AST.ContentNode(content, locInfo);
+
+      this.type = 'block';
+      this.mustache = mustache;
+      this.program = new AST.ProgramNode([content], {}, locInfo);
+    },
+
+    ContentNode: function(string, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "content";
+      this.original = this.string = string;
+    },
+
+    HashNode: function(pairs, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "hash";
+      this.pairs = pairs;
+    },
+
+    IdNode: function(parts, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "ID";
+
+      var original = "",
+          dig = [],
+          depth = 0,
+          depthString = '';
+
+      for(var i=0,l=parts.length; i<l; i++) {
+        var part = parts[i].part;
+        original += (parts[i].separator || '') + part;
+
+        if (part === ".." || part === "." || part === "this") {
+          if (dig.length > 0) {
+            throw new Exception("Invalid path: " + original, this);
+          } else if (part === "..") {
+            depth++;
+            depthString += '../';
+          } else {
+            this.isScoped = true;
+          }
+        } else {
+          dig.push(part);
+        }
+      }
+
+      this.original = original;
+      this.parts    = dig;
+      this.string   = dig.join('.');
+      this.depth    = depth;
+      this.idName   = depthString + this.string;
+
+      // an ID is simple if it only has one part, and that part is not
+      // `..` or `this`.
+      this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
+
+      this.stringModeValue = this.string;
+    },
+
+    PartialNameNode: function(name, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "PARTIAL_NAME";
+      this.name = name.original;
+    },
+
+    DataNode: function(id, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "DATA";
+      this.id = id;
+      this.stringModeValue = id.stringModeValue;
+      this.idName = '@' + id.stringModeValue;
+    },
+
+    StringNode: function(string, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "STRING";
+      this.original =
+        this.string =
+        this.stringModeValue = string;
+    },
+
+    NumberNode: function(number, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "NUMBER";
+      this.original =
+        this.number = number;
+      this.stringModeValue = Number(number);
+    },
+
+    BooleanNode: function(bool, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "BOOLEAN";
+      this.bool = bool;
+      this.stringModeValue = bool === "true";
+    },
+
+    CommentNode: function(comment, locInfo) {
+      LocationInfo.call(this, locInfo);
+      this.type = "comment";
+      this.comment = comment;
+
+      this.strip = {
+        inlineStandalone: true
+      };
+    }
+  };
+
+
+  // Must be exported as an object rather than the root of the module as the jison lexer
+  // most modify the object to operate properly.
+  __exports__ = AST;
+  return __exports__;
+})(__module5__);
+
+// handlebars/compiler/parser.js
+var __module9__ = (function() {
+  "use strict";
+  var __exports__;
+  /* jshint ignore:start */
+  /* istanbul ignore next */
+  /* Jison generated parser */
+  var handlebars = (function(){
+  var parser = {trace: function trace() { },
+  yy: {},
+  symbols_: {"error":2,"root":3,"program":4,"EOF":5,"program_repetition0":6,"statement":7,"mustache":8,"block":9,"rawBlock":10,"partial":11,"CONTENT":12,"COMMENT":13,"openRawBlock":14,"END_RAW_BLOCK":15,"OPEN_RAW_BLOCK":16,"sexpr":17,"CLOSE_RAW_BLOCK":18,"openBlock":19,"block_option0":20,"closeBlock":21,"openInverse":22,"block_option1":23,"OPEN_BLOCK":24,"CLOSE":25,"OPEN_INVERSE":26,"inverseAndProgram":27,"INVERSE":28,"OPEN_ENDBLOCK":29,"path":30,"OPEN":31,"OPEN_UNESCAPED":32,"CLOSE_UNESCAPED":33,"OPEN_PARTIAL":34,"partialName":35,"param":36,"partial_option0":37,"partial_option1":38,"sexpr_repetition0":39,"sexpr_option0":40,"dataName":41,"STRING":42,"NUMBER":43,"BOOLEAN":44,"OPEN_SEXPR":45,"CLOSE_SEXPR":46,"hash":47,"hash_repetition_plus0":48,"hashSegment":49,"ID":50,"EQUALS":51,"DATA":52,"pathSegments":53,"SEP":54,"$accept":0,"$end":1},
+  terminals_: {2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"},
+  productions_: [0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]],
+  performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
+
+  var $0 = $$.length - 1;
+  switch (yystate) {
+  case 1: yy.prepareProgram($$[$0-1].statements, true); return $$[$0-1]; 
+  break;
+  case 2:this.$ = new yy.ProgramNode(yy.prepareProgram($$[$0]), {}, this._$);
+  break;
+  case 3:this.$ = $$[$0];
+  break;
+  case 4:this.$ = $$[$0];
+  break;
+  case 5:this.$ = $$[$0];
+  break;
+  case 6:this.$ = $$[$0];
+  break;
+  case 7:this.$ = new yy.ContentNode($$[$0], this._$);
+  break;
+  case 8:this.$ = new yy.CommentNode($$[$0], this._$);
+  break;
+  case 9:this.$ = new yy.RawBlockNode($$[$0-2], $$[$0-1], $$[$0], this._$);
+  break;
+  case 10:this.$ = new yy.MustacheNode($$[$0-1], null, '', '', this._$);
+  break;
+  case 11:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], false, this._$);
+  break;
+  case 12:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], true, this._$);
+  break;
+  case 13:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
+  break;
+  case 14:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
+  break;
+  case 15:this.$ = { strip: yy.stripFlags($$[$0-1], $$[$0-1]), program: $$[$0] };
+  break;
+  case 16:this.$ = {path: $$[$0-1], strip: yy.stripFlags($$[$0-2], $$[$0])};
+  break;
+  case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
+  break;
+  case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
+  break;
+  case 19:this.$ = new yy.PartialNode($$[$0-3], $$[$0-2], $$[$0-1], yy.stripFlags($$[$0-4], $$[$0]), this._$);
+  break;
+  case 20:this.$ = new yy.PartialNode($$[$0-2], undefined, $$[$0-1], yy.stripFlags($$[$0-3], $$[$0]), this._$);
+  break;
+  case 21:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$);
+  break;
+  case 22:this.$ = new yy.SexprNode([$$[$0]], null, this._$);
+  break;
+  case 23:this.$ = $$[$0];
+  break;
+  case 24:this.$ = new yy.StringNode($$[$0], this._$);
+  break;
+  case 25:this.$ = new yy.NumberNode($$[$0], this._$);
+  break;
+  case 26:this.$ = new yy.BooleanNode($$[$0], this._$);
+  break;
+  case 27:this.$ = $$[$0];
+  break;
+  case 28:$$[$0-1].isHelper = true; this.$ = $$[$0-1];
+  break;
+  case 29:this.$ = new yy.HashNode($$[$0], this._$);
+  break;
+  case 30:this.$ = [$$[$0-2], $$[$0]];
+  break;
+  case 31:this.$ = new yy.PartialNameNode($$[$0], this._$);
+  break;
+  case 32:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$);
+  break;
+  case 33:this.$ = new yy.PartialNameNode(new yy.NumberNode($$[$0], this._$));
+  break;
+  case 34:this.$ = new yy.DataNode($$[$0], this._$);
+  break;
+  case 35:this.$ = new yy.IdNode($$[$0], this._$);
+  break;
+  case 36: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
+  break;
+  case 37:this.$ = [{part: $$[$0]}];
+  break;
+  case 38:this.$ = [];
+  break;
+  case 39:$$[$0-1].push($$[$0]);
+  break;
+  case 48:this.$ = [];
+  break;
+  case 49:$$[$0-1].push($$[$0]);
+  break;
+  case 52:this.$ = [$$[$0]];
+  break;
+  case 53:$$[$0-1].push($$[$0]);
+  break;
+  }
+  },
+  table: [{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}],
+  defaultActions: {4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]},
+  parseError: function parseError(str, hash) {
+      throw new Error(str);
+  },
+  parse: function parse(input) {
+      var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
+      this.lexer.setInput(input);
+      this.lexer.yy = this.yy;
+      this.yy.lexer = this.lexer;
+      this.yy.parser = this;
+      if (typeof this.lexer.yylloc == "undefined")
+          this.lexer.yylloc = {};
+      var yyloc = this.lexer.yylloc;
+      lstack.push(yyloc);
+      var ranges = this.lexer.options && this.lexer.options.ranges;
+      if (typeof this.yy.parseError === "function")
+          this.parseError = this.yy.parseError;
+      function popStack(n) {
+          stack.length = stack.length - 2 * n;
+          vstack.length = vstack.length - n;
+          lstack.length = lstack.length - n;
+      }
+      function lex() {
+          var token;
+          token = self.lexer.lex() || 1;
+          if (typeof token !== "number") {
+              token = self.symbols_[token] || token;
+          }
+          return token;
+      }
+      var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
+      while (true) {
+          state = stack[stack.length - 1];
+          if (this.defaultActions[state]) {
+              action = this.defaultActions[state];
+          } else {
+              if (symbol === null || typeof symbol == "undefined") {
+                  symbol = lex();
+              }
+              action = table[state] && table[state][symbol];
+          }
+          if (typeof action === "undefined" || !action.length || !action[0]) {
+              var errStr = "";
+              if (!recovering) {
+                  expected = [];
+                  for (p in table[state])
+                      if (this.terminals_[p] && p > 2) {
+                          expected.push("'" + this.terminals_[p] + "'");
+                      }
+                  if (this.lexer.showPosition) {
+                      errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
+                  } else {
+                      errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
+                  }
+                  this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
+              }
+          }
+          if (action[0] instanceof Array && action.length > 1) {
+              throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
+          }
+          switch (action[0]) {
+          case 1:
+              stack.push(symbol);
+              vstack.push(this.lexer.yytext);
+              lstack.push(this.lexer.yylloc);
+              stack.push(action[1]);
+              symbol = null;
+              if (!preErrorSymbol) {
+                  yyleng = this.lexer.yyleng;
+                  yytext = this.lexer.yytext;
+                  yylineno = this.lexer.yylineno;
+                  yyloc = this.lexer.yylloc;
+                  if (recovering > 0)
+                      recovering--;
+              } else {
+                  symbol = preErrorSymbol;
+                  preErrorSymbol = null;
+              }
+              break;
+          case 2:
+              len = this.productions_[action[1]][1];
+              yyval.$ = vstack[vstack.length - len];
+              yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
+              if (ranges) {
+                  yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
+              }
+              r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
+              if (typeof r !== "undefined") {
+                  return r;
+              }
+              if (len) {
+                  stack = stack.slice(0, -1 * len * 2);
+                  vstack = vstack.slice(0, -1 * len);
+                  lstack = lstack.slice(0, -1 * len);
+              }
+              stack.push(this.productions_[action[1]][0]);
+              vstack.push(yyval.$);
+              lstack.push(yyval._$);
+              newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
+              stack.push(newState);
+              break;
+          case 3:
+              return true;
+          }
+      }
+      return true;
+  }
+  };
+  /* Jison generated lexer */
+  var lexer = (function(){
+  var lexer = ({EOF:1,
+  parseError:function parseError(str, hash) {
+          if (this.yy.parser) {
+              this.yy.parser.parseError(str, hash);
+          } else {
+              throw new Error(str);
+          }
+      },
+  setInput:function (input) {
+          this._input = input;
+          this._more = this._less = this.done = false;
+          this.yylineno = this.yyleng = 0;
+          this.yytext = this.matched = this.match = '';
+          this.conditionStack = ['INITIAL'];
+          this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
+          if (this.options.ranges) this.yylloc.range = [0,0];
+          this.offset = 0;
+          return this;
+      },
+  input:function () {
+          var ch = this._input[0];
+          this.yytext += ch;
+          this.yyleng++;
+          this.offset++;
+          this.match += ch;
+          this.matched += ch;
+          var lines = ch.match(/(?:\r\n?|\n).*/g);
+          if (lines) {
+              this.yylineno++;
+              this.yylloc.last_line++;
+          } else {
+              this.yylloc.last_column++;
+          }
+          if (this.options.ranges) this.yylloc.range[1]++;
+
+          this._input = this._input.slice(1);
+          return ch;
+      },
+  unput:function (ch) {
+          var len = ch.length;
+          var lines = ch.split(/(?:\r\n?|\n)/g);
+
+          this._input = ch + this._input;
+          this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
+          //this.yyleng -= len;
+          this.offset -= len;
+          var oldLines = this.match.split(/(?:\r\n?|\n)/g);
+          this.match = this.match.substr(0, this.match.length-1);
+          this.matched = this.matched.substr(0, this.matched.length-1);
+
+          if (lines.length-1) this.yylineno -= lines.length-1;
+          var r = this.yylloc.range;
+
+          this.yylloc = {first_line: this.yylloc.first_line,
+            last_line: this.yylineno+1,
+            first_column: this.yylloc.first_column,
+            last_column: lines ?
+                (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
+                this.yylloc.first_column - len
+            };
+
+          if (this.options.ranges) {
+              this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+          }
+          return this;
+      },
+  more:function () {
+          this._more = true;
+          return this;
+      },
+  less:function (n) {
+          this.unput(this.match.slice(n));
+      },
+  pastInput:function () {
+          var past = this.matched.substr(0, this.matched.length - this.match.length);
+          return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
+      },
+  upcomingInput:function () {
+          var next = this.match;
+          if (next.length < 20) {
+              next += this._input.substr(0, 20-next.length);
+          }
+          return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
+      },
+  showPosition:function () {
+          var pre = this.pastInput();
+          var c = new Array(pre.length + 1).join("-");
+          return pre + this.upcomingInput() + "\n" + c+"^";
+      },
+  next:function () {
+          if (this.done) {
+              return this.EOF;
+          }
+          if (!this._input) this.done = true;
+
+          var token,
+              match,
+              tempMatch,
+              index,
+              col,
+              lines;
+          if (!this._more) {
+              this.yytext = '';
+              this.match = '';
+          }
+          var rules = this._currentRules();
+          for (var i=0;i < rules.length; i++) {
+              tempMatch = this._input.match(this.rules[rules[i]]);
+              if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
+                  match = tempMatch;
+                  index = i;
+                  if (!this.options.flex) break;
+              }
+          }
+          if (match) {
+              lines = match[0].match(/(?:\r\n?|\n).*/g);
+              if (lines) this.yylineno += lines.length;
+              this.yylloc = {first_line: this.yylloc.last_line,
+                             last_line: this.yylineno+1,
+                             first_column: this.yylloc.last_column,
+                             last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
+              this.yytext += match[0];
+              this.match += match[0];
+              this.matches = match;
+              this.yyleng = this.yytext.length;
+              if (this.options.ranges) {
+                  this.yylloc.range = [this.offset, this.offset += this.yyleng];
+              }
+              this._more = false;
+              this._input = this._input.slice(match[0].length);
+              this.matched += match[0];
+              token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
+              if (this.done && this._input) this.done = false;
+              if (token) return token;
+              else return;
+          }
+          if (this._input === "") {
+              return this.EOF;
+          } else {
+              return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
+                      {text: "", token: null, line: this.yylineno});
+          }
+      },
+  lex:function lex() {
+          var r = this.next();
+          if (typeof r !== 'undefined') {
+              return r;
+          } else {
+              return this.lex();
+          }
+      },
+  begin:function begin(condition) {
+          this.conditionStack.push(condition);
+      },
+  popState:function popState() {
+          return this.conditionStack.pop();
+      },
+  _currentRules:function _currentRules() {
+          return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
+      },
+  topState:function () {
+          return this.conditionStack[this.conditionStack.length-2];
+      },
+  pushState:function begin(condition) {
+          this.begin(condition);
+      }});
+  lexer.options = {};
+  lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
+
+
+  function strip(start, end) {
+    return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end);
+  }
+
+
+  var YYSTATE=YY_START
+  switch($avoiding_name_collisions) {
+  case 0:
+                                     if(yy_.yytext.slice(-2) === "\\\\") {
+                                       strip(0,1);
+                                       this.begin("mu");
+                                     } else if(yy_.yytext.slice(-1) === "\\") {
+                                       strip(0,1);
+                                       this.begin("emu");
+                                     } else {
+                                       this.begin("mu");
+                                     }
+                                     if(yy_.yytext) return 12;
+                                   
+  break;
+  case 1:return 12;
+  break;
+  case 2:
+                                     this.popState();
+                                     return 12;
+                                   
+  break;
+  case 3:
+                                    yy_.yytext = yy_.yytext.substr(5, yy_.yyleng-9);
+                                    this.popState();
+                                    return 15;
+                                   
+  break;
+  case 4: return 12; 
+  break;
+  case 5:strip(0,4); this.popState(); return 13;
+  break;
+  case 6:return 45;
+  break;
+  case 7:return 46;
+  break;
+  case 8: return 16; 
+  break;
+  case 9:
+                                    this.popState();
+                                    this.begin('raw');
+                                    return 18;
+                                   
+  break;
+  case 10:return 34;
+  break;
+  case 11:return 24;
+  break;
+  case 12:return 29;
+  break;
+  case 13:this.popState(); return 28;
+  break;
+  case 14:this.popState(); return 28;
+  break;
+  case 15:return 26;
+  break;
+  case 16:return 26;
+  break;
+  case 17:return 32;
+  break;
+  case 18:return 31;
+  break;
+  case 19:this.popState(); this.begin('com');
+  break;
+  case 20:strip(3,5); this.popState(); return 13;
+  break;
+  case 21:return 31;
+  break;
+  case 22:return 51;
+  break;
+  case 23:return 50;
+  break;
+  case 24:return 50;
+  break;
+  case 25:return 54;
+  break;
+  case 26:// ignore whitespace
+  break;
+  case 27:this.popState(); return 33;
+  break;
+  case 28:this.popState(); return 25;
+  break;
+  case 29:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 42;
+  break;
+  case 30:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 42;
+  break;
+  case 31:return 52;
+  break;
+  case 32:return 44;
+  break;
+  case 33:return 44;
+  break;
+  case 34:return 43;
+  break;
+  case 35:return 50;
+  break;
+  case 36:yy_.yytext = strip(1,2); return 50;
+  break;
+  case 37:return 'INVALID';
+  break;
+  case 38:return 5;
+  break;
+  }
+  };
+  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
+  lexer.conditions = {"mu":{"rules":[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[5],"inclusive":false},"raw":{"rules":[3,4],"inclusive":false},"INITIAL":{"rules":[0,1,38],"inclusive":true}};
+  return lexer;})()
+  parser.lexer = lexer;
+  function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
+  return new Parser;
+  })();__exports__ = handlebars;
+  /* jshint ignore:end */
+  return __exports__;
+})();
+
+// handlebars/compiler/helpers.js
+var __module10__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  var Exception = __dependency1__;
+
+  function stripFlags(open, close) {
+    return {
+      left: open.charAt(2) === '~',
+      right: close.charAt(close.length-3) === '~'
+    };
+  }
+
+  __exports__.stripFlags = stripFlags;
+  function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) {
+    /*jshint -W040 */
+    if (mustache.sexpr.id.original !== close.path.original) {
+      throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache);
+    }
+
+    var inverse = inverseAndProgram && inverseAndProgram.program;
+
+    var strip = {
+      left: mustache.strip.left,
+      right: close.strip.right,
+
+      // Determine the standalone candiacy. Basically flag our content as being possibly standalone
+      // so our parent can determine if we actually are standalone
+      openStandalone: isNextWhitespace(program.statements),
+      closeStandalone: isPrevWhitespace((inverse || program).statements)
+    };
+
+    if (mustache.strip.right) {
+      omitRight(program.statements, null, true);
+    }
+
+    if (inverse) {
+      var inverseStrip = inverseAndProgram.strip;
+
+      if (inverseStrip.left) {
+        omitLeft(program.statements, null, true);
+      }
+      if (inverseStrip.right) {
+        omitRight(inverse.statements, null, true);
+      }
+      if (close.strip.left) {
+        omitLeft(inverse.statements, null, true);
+      }
+
+      // Find standalone else statments
+      if (isPrevWhitespace(program.statements)
+          && isNextWhitespace(inverse.statements)) {
+
+        omitLeft(program.statements);
+        omitRight(inverse.statements);
+      }
+    } else {
+      if (close.strip.left) {
+        omitLeft(program.statements, null, true);
+      }
+    }
+
+    if (inverted) {
+      return new this.BlockNode(mustache, inverse, program, strip, locInfo);
+    } else {
+      return new this.BlockNode(mustache, program, inverse, strip, locInfo);
+    }
+  }
+
+  __exports__.prepareBlock = prepareBlock;
+  function prepareProgram(statements, isRoot) {
+    for (var i = 0, l = statements.length; i < l; i++) {
+      var current = statements[i],
+          strip = current.strip;
+
+      if (!strip) {
+        continue;
+      }
+
+      var _isPrevWhitespace = isPrevWhitespace(statements, i, isRoot, current.type === 'partial'),
+          _isNextWhitespace = isNextWhitespace(statements, i, isRoot),
+
+          openStandalone = strip.openStandalone && _isPrevWhitespace,
+          closeStandalone = strip.closeStandalone && _isNextWhitespace,
+          inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
+
+      if (strip.right) {
+        omitRight(statements, i, true);
+      }
+      if (strip.left) {
+        omitLeft(statements, i, true);
+      }
+
+      if (inlineStandalone) {
+        omitRight(statements, i);
+
+        if (omitLeft(statements, i)) {
+          // If we are on a standalone node, save the indent info for partials
+          if (current.type === 'partial') {
+            current.indent = (/([ \t]+$)/).exec(statements[i-1].original) ? RegExp.$1 : '';
+          }
+        }
+      }
+      if (openStandalone) {
+        omitRight((current.program || current.inverse).statements);
+
+        // Strip out the previous content node if it's whitespace only
+        omitLeft(statements, i);
+      }
+      if (closeStandalone) {
+        // Always strip the next node
+        omitRight(statements, i);
+
+        omitLeft((current.inverse || current.program).statements);
+      }
+    }
+
+    return statements;
+  }
+
+  __exports__.prepareProgram = prepareProgram;function isPrevWhitespace(statements, i, isRoot) {
+    if (i === undefined) {
+      i = statements.length;
+    }
+
+    // Nodes that end with newlines are considered whitespace (but are special
+    // cased for strip operations)
+    var prev = statements[i-1],
+        sibling = statements[i-2];
+    if (!prev) {
+      return isRoot;
+    }
+
+    if (prev.type === 'content') {
+      return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
+    }
+  }
+  function isNextWhitespace(statements, i, isRoot) {
+    if (i === undefined) {
+      i = -1;
+    }
+
+    var next = statements[i+1],
+        sibling = statements[i+2];
+    if (!next) {
+      return isRoot;
+    }
+
+    if (next.type === 'content') {
+      return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
+    }
+  }
+
+  // Marks the node to the right of the position as omitted.
+  // I.e. {{foo}}' ' will mark the ' ' node as omitted.
+  //
+  // If i is undefined, then the first child will be marked as such.
+  //
+  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+  // content is met.
+  function omitRight(statements, i, multiple) {
+    var current = statements[i == null ? 0 : i + 1];
+    if (!current || current.type !== 'content' || (!multiple && current.rightStripped)) {
+      return;
+    }
+
+    var original = current.string;
+    current.string = current.string.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
+    current.rightStripped = current.string !== original;
+  }
+
+  // Marks the node to the left of the position as omitted.
+  // I.e. ' '{{foo}} will mark the ' ' node as omitted.
+  //
+  // If i is undefined then the last child will be marked as such.
+  //
+  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+  // content is met.
+  function omitLeft(statements, i, multiple) {
+    var current = statements[i == null ? statements.length - 1 : i - 1];
+    if (!current || current.type !== 'content' || (!multiple && current.leftStripped)) {
+      return;
+    }
+
+    // We omit the last node if it's whitespace only and not preceded by a non-content node.
+    var original = current.string;
+    current.string = current.string.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
+    current.leftStripped = current.string !== original;
+    return current.leftStripped;
+  }
+  return __exports__;
+})(__module5__);
+
+// handlebars/compiler/base.js
+var __module8__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+  "use strict";
+  var __exports__ = {};
+  var parser = __dependency1__;
+  var AST = __dependency2__;
+  var Helpers = __dependency3__;
+  var extend = __dependency4__.extend;
+
+  __exports__.parser = parser;
+
+  var yy = {};
+  extend(yy, Helpers, AST);
+
+  function parse(input) {
+    // Just return if an already-compile AST was passed in.
+    if (input.constructor === AST.ProgramNode) { return input; }
+
+    parser.yy = yy;
+
+    return parser.parse(input);
+  }
+
+  __exports__.parse = parse;
+  return __exports__;
+})(__module9__, __module7__, __module10__, __module3__);
+
+// handlebars/compiler/compiler.js
+var __module11__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__ = {};
+  var Exception = __dependency1__;
+  var isArray = __dependency2__.isArray;
+
+  var slice = [].slice;
+
+  function Compiler() {}
+
+  __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a
+  // function in a context. This is necessary for mustache compatibility, which
+  // requires that context functions in blocks are evaluated by blockHelperMissing,
+  // and then proceed as if the resulting value was provided to blockHelperMissing.
+
+  Compiler.prototype = {
+    compiler: Compiler,
+
+    equals: function(other) {
+      var len = this.opcodes.length;
+      if (other.opcodes.length !== len) {
+        return false;
+      }
+
+      for (var i = 0; i < len; i++) {
+        var opcode = this.opcodes[i],
+            otherOpcode = other.opcodes[i];
+        if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
+          return false;
+        }
+      }
+
+      // We know that length is the same between the two arrays because they are directly tied
+      // to the opcode behavior above.
+      len = this.children.length;
+      for (i = 0; i < len; i++) {
+        if (!this.children[i].equals(other.children[i])) {
+          return false;
+        }
+      }
+
+      return true;
+    },
+
+    guid: 0,
+
+    compile: function(program, options) {
+      this.opcodes = [];
+      this.children = [];
+      this.depths = {list: []};
+      this.options = options;
+      this.stringParams = options.stringParams;
+      this.trackIds = options.trackIds;
+
+      // These changes will propagate to the other compiler components
+      var knownHelpers = this.options.knownHelpers;
+      this.options.knownHelpers = {
+        'helperMissing': true,
+        'blockHelperMissing': true,
+        'each': true,
+        'if': true,
+        'unless': true,
+        'with': true,
+        'log': true,
+        'lookup': true
+      };
+      if (knownHelpers) {
+        for (var name in knownHelpers) {
+          this.options.knownHelpers[name] = knownHelpers[name];
+        }
+      }
+
+      return this.accept(program);
+    },
+
+    accept: function(node) {
+      return this[node.type](node);
+    },
+
+    program: function(program) {
+      var statements = program.statements;
+
+      for(var i=0, l=statements.length; i<l; i++) {
+        this.accept(statements[i]);
+      }
+      this.isSimple = l === 1;
+
+      this.depths.list = this.depths.list.sort(function(a, b) {
+        return a - b;
+      });
+
+      return this;
+    },
+
+    compileProgram: function(program) {
+      var result = new this.compiler().compile(program, this.options);
+      var guid = this.guid++, depth;
+
+      this.usePartial = this.usePartial || result.usePartial;
+
+      this.children[guid] = result;
+
+      for(var i=0, l=result.depths.list.length; i<l; i++) {
+        depth = result.depths.list[i];
+
+        if(depth < 2) { continue; }
+        else { this.addDepth(depth - 1); }
+      }
+
+      return guid;
+    },
+
+    block: function(block) {
+      var mustache = block.mustache,
+          program = block.program,
+          inverse = block.inverse;
+
+      if (program) {
+        program = this.compileProgram(program);
+      }
+
+      if (inverse) {
+        inverse = this.compileProgram(inverse);
+      }
+
+      var sexpr = mustache.sexpr;
+      var type = this.classifySexpr(sexpr);
+
+      if (type === "helper") {
+        this.helperSexpr(sexpr, program, inverse);
+      } else if (type === "simple") {
+        this.simpleSexpr(sexpr);
+
+        // now that the simple mustache is resolved, we need to
+        // evaluate it by executing `blockHelperMissing`
+        this.opcode('pushProgram', program);
+        this.opcode('pushProgram', inverse);
+        this.opcode('emptyHash');
+        this.opcode('blockValue', sexpr.id.original);
+      } else {
+        this.ambiguousSexpr(sexpr, program, inverse);
+
+        // now that the simple mustache is resolved, we need to
+        // evaluate it by executing `blockHelperMissing`
+        this.opcode('pushProgram', program);
+        this.opcode('pushProgram', inverse);
+        this.opcode('emptyHash');
+        this.opcode('ambiguousBlockValue');
+      }
+
+      this.opcode('append');
+    },
+
+    hash: function(hash) {
+      var pairs = hash.pairs, i, l;
+
+      this.opcode('pushHash');
+
+      for(i=0, l=pairs.length; i<l; i++) {
+        this.pushParam(pairs[i][1]);
+      }
+      while(i--) {
+        this.opcode('assignToHash', pairs[i][0]);
+      }
+      this.opcode('popHash');
+    },
+
+    partial: function(partial) {
+      var partialName = partial.partialName;
+      this.usePartial = true;
+
+      if (partial.hash) {
+        this.accept(partial.hash);
+      } else {
+        this.opcode('push', 'undefined');
+      }
+
+      if (partial.context) {
+        this.accept(partial.context);
+      } else {
+        this.opcode('getContext', 0);
+        this.opcode('pushContext');
+      }
+
+      this.opcode('invokePartial', partialName.name, partial.indent || '');
+      this.opcode('append');
+    },
+
+    content: function(content) {
+      if (content.string) {
+        this.opcode('appendContent', content.string);
+      }
+    },
+
+    mustache: function(mustache) {
+      this.sexpr(mustache.sexpr);
+
+      if(mustache.escaped && !this.options.noEscape) {
+        this.opcode('appendEscaped');
+      } else {
+        this.opcode('append');
+      }
+    },
+
+    ambiguousSexpr: function(sexpr, program, inverse) {
+      var id = sexpr.id,
+          name = id.parts[0],
+          isBlock = program != null || inverse != null;
+
+      this.opcode('getContext', id.depth);
+
+      this.opcode('pushProgram', program);
+      this.opcode('pushProgram', inverse);
+
+      this.ID(id);
+
+      this.opcode('invokeAmbiguous', name, isBlock);
+    },
+
+    simpleSexpr: function(sexpr) {
+      var id = sexpr.id;
+
+      if (id.type === 'DATA') {
+        this.DATA(id);
+      } else if (id.parts.length) {
+        this.ID(id);
+      } else {
+        // Simplified ID for `this`
+        this.addDepth(id.depth);
+        this.opcode('getContext', id.depth);
+        this.opcode('pushContext');
+      }
+
+      this.opcode('resolvePossibleLambda');
+    },
+
+    helperSexpr: function(sexpr, program, inverse) {
+      var params = this.setupFullMustacheParams(sexpr, program, inverse),
+          id = sexpr.id,
+          name = id.parts[0];
+
+      if (this.options.knownHelpers[name]) {
+        this.opcode('invokeKnownHelper', params.length, name);
+      } else if (this.options.knownHelpersOnly) {
+        throw new Exception("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
+      } else {
+        id.falsy = true;
+
+        this.ID(id);
+        this.opcode('invokeHelper', params.length, id.original, id.isSimple);
+      }
+    },
+
+    sexpr: function(sexpr) {
+      var type = this.classifySexpr(sexpr);
+
+      if (type === "simple") {
+        this.simpleSexpr(sexpr);
+      } else if (type === "helper") {
+        this.helperSexpr(sexpr);
+      } else {
+        this.ambiguousSexpr(sexpr);
+      }
+    },
+
+    ID: function(id) {
+      this.addDepth(id.depth);
+      this.opcode('getContext', id.depth);
+
+      var name = id.parts[0];
+      if (!name) {
+        // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
+        this.opcode('pushContext');
+      } else {
+        this.opcode('lookupOnContext', id.parts, id.falsy, id.isScoped);
+      }
+    },
+
+    DATA: function(data) {
+      this.options.data = true;
+      this.opcode('lookupData', data.id.depth, data.id.parts);
+    },
+
+    STRING: function(string) {
+      this.opcode('pushString', string.string);
+    },
+
+    NUMBER: function(number) {
+      this.opcode('pushLiteral', number.number);
+    },
+
+    BOOLEAN: function(bool) {
+      this.opcode('pushLiteral', bool.bool);
+    },
+
+    comment: function() {},
+
+    // HELPERS
+    opcode: function(name) {
+      this.opcodes.push({ opcode: name, args: slice.call(arguments, 1) });
+    },
+
+    addDepth: function(depth) {
+      if(depth === 0) { return; }
+
+      if(!this.depths[depth]) {
+        this.depths[depth] = true;
+        this.depths.list.push(depth);
+      }
+    },
+
+    classifySexpr: function(sexpr) {
+      var isHelper   = sexpr.isHelper;
+      var isEligible = sexpr.eligibleHelper;
+      var options    = this.options;
+
+      // if ambiguous, we can possibly resolve the ambiguity now
+      // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
+      if (isEligible && !isHelper) {
+        var name = sexpr.id.parts[0];
+
+        if (options.knownHelpers[name]) {
+          isHelper = true;
+        } else if (options.knownHelpersOnly) {
+          isEligible = false;
+        }
+      }
+
+      if (isHelper) { return "helper"; }
+      else if (isEligible) { return "ambiguous"; }
+      else { return "simple"; }
+    },
+
+    pushParams: function(params) {
+      for(var i=0, l=params.length; i<l; i++) {
+        this.pushParam(params[i]);
+      }
+    },
+
+    pushParam: function(val) {
+      if (this.stringParams) {
+        if(val.depth) {
+          this.addDepth(val.depth);
+        }
+        this.opcode('getContext', val.depth || 0);
+        this.opcode('pushStringParam', val.stringModeValue, val.type);
+
+        if (val.type === 'sexpr') {
+          // Subexpressions get evaluated and passed in
+          // in string params mode.
+          this.sexpr(val);
+        }
+      } else {
+        if (this.trackIds) {
+          this.opcode('pushId', val.type, val.idName || val.stringModeValue);
+        }
+        this.accept(val);
+      }
+    },
+
+    setupFullMustacheParams: function(sexpr, program, inverse) {
+      var params = sexpr.params;
+      this.pushParams(params);
+
+      this.opcode('pushProgram', program);
+      this.opcode('pushProgram', inverse);
+
+      if (sexpr.hash) {
+        this.hash(sexpr.hash);
+      } else {
+        this.opcode('emptyHash');
+      }
+
+      return params;
+    }
+  };
+
+  function precompile(input, options, env) {
+    if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
+      throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
+    }
+
+    options = options || {};
+    if (!('data' in options)) {
+      options.data = true;
+    }
+    if (options.compat) {
+      options.useDepths = true;
+    }
+
+    var ast = env.parse(input);
+    var environment = new env.Compiler().compile(ast, options);
+    return new env.JavaScriptCompiler().compile(environment, options);
+  }
+
+  __exports__.precompile = precompile;function compile(input, options, env) {
+    if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
+      throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
+    }
+
+    options = options || {};
+
+    if (!('data' in options)) {
+      options.data = true;
+    }
+    if (options.compat) {
+      options.useDepths = true;
+    }
+
+    var compiled;
+
+    function compileInput() {
+      var ast = env.parse(input);
+      var environment = new env.Compiler().compile(ast, options);
+      var templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
+      return env.template(templateSpec);
+    }
+
+    // Template is only compiled on first use and cached after that point.
+    var ret = function(context, options) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled.call(this, context, options);
+    };
+    ret._setup = function(options) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled._setup(options);
+    };
+    ret._child = function(i, data, depths) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled._child(i, data, depths);
+    };
+    return ret;
+  }
+
+  __exports__.compile = compile;function argEquals(a, b) {
+    if (a === b) {
+      return true;
+    }
+
+    if (isArray(a) && isArray(b) && a.length === b.length) {
+      for (var i = 0; i < a.length; i++) {
+        if (!argEquals(a[i], b[i])) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+  return __exports__;
+})(__module5__, __module3__);
+
+// handlebars/compiler/javascript-compiler.js
+var __module12__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__;
+  var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
+  var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
+  var Exception = __dependency2__;
+
+  function Literal(value) {
+    this.value = value;
+  }
+
+  function JavaScriptCompiler() {}
+
+  JavaScriptCompiler.prototype = {
+    // PUBLIC API: You can override these methods in a subclass to provide
+    // alternative compiled forms for name lookup and buffering semantics
+    nameLookup: function(parent, name /* , type*/) {
+      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+        return parent + "." + name;
+      } else {
+        return parent + "['" + name + "']";
+      }
+    },
+    depthedLookup: function(name) {
+      this.aliases.lookup = 'this.lookup';
+
+      return 'lookup(depths, "' + name + '")';
+    },
+
+    compilerInfo: function() {
+      var revision = COMPILER_REVISION,
+          versions = REVISION_CHANGES[revision];
+      return [revision, versions];
+    },
+
+    appendToBuffer: function(string) {
+      if (this.environment.isSimple) {
+        return "return " + string + ";";
+      } else {
+        return {
+          appendToBuffer: true,
+          content: string,
+          toString: function() { return "buffer += " + string + ";"; }
+        };
+      }
+    },
+
+    initializeBuffer: function() {
+      return this.quotedString("");
+    },
+
+    namespace: "Handlebars",
+    // END PUBLIC API
+
+    compile: function(environment, options, context, asObject) {
+      this.environment = environment;
+      this.options = options;
+      this.stringParams = this.options.stringParams;
+      this.trackIds = this.options.trackIds;
+      this.precompile = !asObject;
+
+      this.name = this.environment.name;
+      this.isChild = !!context;
+      this.context = context || {
+        programs: [],
+        environments: []
+      };
+
+      this.preamble();
+
+      this.stackSlot = 0;
+      this.stackVars = [];
+      this.aliases = {};
+      this.registers = { list: [] };
+      this.hashes = [];
+      this.compileStack = [];
+      this.inlineStack = [];
+
+      this.compileChildren(environment, options);
+
+      this.useDepths = this.useDepths || environment.depths.list.length || this.options.compat;
+
+      var opcodes = environment.opcodes,
+          opcode,
+          i,
+          l;
+
+      for (i = 0, l = opcodes.length; i < l; i++) {
+        opcode = opcodes[i];
+
+        this[opcode.opcode].apply(this, opcode.args);
+      }
+
+      // Flush any trailing content that might be pending.
+      this.pushSource('');
+
+      /* istanbul ignore next */
+      if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
+        throw new Exception('Compile completed with content left on stack');
+      }
+
+      var fn = this.createFunctionContext(asObject);
+      if (!this.isChild) {
+        var ret = {
+          compiler: this.compilerInfo(),
+          main: fn
+        };
+        var programs = this.context.programs;
+        for (i = 0, l = programs.length; i < l; i++) {
+          if (programs[i]) {
+            ret[i] = programs[i];
+          }
+        }
+
+        if (this.environment.usePartial) {
+          ret.usePartial = true;
+        }
+        if (this.options.data) {
+          ret.useData = true;
+        }
+        if (this.useDepths) {
+          ret.useDepths = true;
+        }
+        if (this.options.compat) {
+          ret.compat = true;
+        }
+
+        if (!asObject) {
+          ret.compiler = JSON.stringify(ret.compiler);
+          ret = this.objectLiteral(ret);
+        }
+
+        return ret;
+      } else {
+        return fn;
+      }
+    },
+
+    preamble: function() {
+      // track the last context pushed into place to allow skipping the
+      // getContext opcode when it would be a noop
+      this.lastContext = 0;
+      this.source = [];
+    },
+
+    createFunctionContext: function(asObject) {
+      var varDeclarations = '';
+
+      var locals = this.stackVars.concat(this.registers.list);
+      if(locals.length > 0) {
+        varDeclarations += ", " + locals.join(", ");
+      }
+
+      // Generate minimizer alias mappings
+      for (var alias in this.aliases) {
+        if (this.aliases.hasOwnProperty(alias)) {
+          varDeclarations += ', ' + alias + '=' + this.aliases[alias];
+        }
+      }
+
+      var params = ["depth0", "helpers", "partials", "data"];
+
+      if (this.useDepths) {
+        params.push('depths');
+      }
+
+      // Perform a second pass over the output to merge content when possible
+      var source = this.mergeSource(varDeclarations);
+
+      if (asObject) {
+        params.push(source);
+
+        return Function.apply(this, params);
+      } else {
+        return 'function(' + params.join(',') + ') {\n  ' + source + '}';
+      }
+    },
+    mergeSource: function(varDeclarations) {
+      var source = '',
+          buffer,
+          appendOnly = !this.forceBuffer,
+          appendFirst;
+
+      for (var i = 0, len = this.source.length; i < len; i++) {
+        var line = this.source[i];
+        if (line.appendToBuffer) {
+          if (buffer) {
+            buffer = buffer + '\n    + ' + line.content;
+          } else {
+            buffer = line.content;
+          }
+        } else {
+          if (buffer) {
+            if (!source) {
+              appendFirst = true;
+              source = buffer + ';\n  ';
+            } else {
+              source += 'buffer += ' + buffer + ';\n  ';
+            }
+            buffer = undefined;
+          }
+          source += line + '\n  ';
+
+          if (!this.environment.isSimple) {
+            appendOnly = false;
+          }
+        }
+      }
+
+      if (appendOnly) {
+        if (buffer || !source) {
+          source += 'return ' + (buffer || '""') + ';\n';
+        }
+      } else {
+        varDeclarations += ", buffer = " + (appendFirst ? '' : this.initializeBuffer());
+        if (buffer) {
+          source += 'return buffer + ' + buffer + ';\n';
+        } else {
+          source += 'return buffer;\n';
+        }
+      }
+
+      if (varDeclarations) {
+        source = 'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n  ') + source;
+      }
+
+      return source;
+    },
+
+    // [blockValue]
+    //
+    // On stack, before: hash, inverse, program, value
+    // On stack, after: return value of blockHelperMissing
+    //
+    // The purpose of this opcode is to take a block of the form
+    // `{{#this.foo}}...{{/this.foo}}`, resolve the value of `foo`, and
+    // replace it on the stack with the result of properly
+    // invoking blockHelperMissing.
+    blockValue: function(name) {
+      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+      var params = [this.contextName(0)];
+      this.setupParams(name, 0, params);
+
+      var blockName = this.popStack();
+      params.splice(1, 0, blockName);
+
+      this.push('blockHelperMissing.call(' + params.join(', ') + ')');
+    },
+
+    // [ambiguousBlockValue]
+    //
+    // On stack, before: hash, inverse, program, value
+    // Compiler value, before: lastHelper=value of last found helper, if any
+    // On stack, after, if no lastHelper: same as [blockValue]
+    // On stack, after, if lastHelper: value
+    ambiguousBlockValue: function() {
+      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+      // We're being a bit cheeky and reusing the options value from the prior exec
+      var params = [this.contextName(0)];
+      this.setupParams('', 0, params, true);
+
+      this.flushInline();
+
+      var current = this.topStack();
+      params.splice(1, 0, current);
+
+      this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
+    },
+
+    // [appendContent]
+    //
+    // On stack, before: ...
+    // On stack, after: ...
+    //
+    // Appends the string value of `content` to the current buffer
+    appendContent: function(content) {
+      if (this.pendingContent) {
+        content = this.pendingContent + content;
+      }
+
+      this.pendingContent = content;
+    },
+
+    // [append]
+    //
+    // On stack, before: value, ...
+    // On stack, after: ...
+    //
+    // Coerces `value` to a String and appends it to the current buffer.
+    //
+    // If `value` is truthy, or 0, it is coerced into a string and appended
+    // Otherwise, the empty string is appended
+    append: function() {
+      // Force anything that is inlined onto the stack so we don't have duplication
+      // when we examine local
+      this.flushInline();
+      var local = this.popStack();
+      this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }');
+      if (this.environment.isSimple) {
+        this.pushSource("else { " + this.appendToBuffer("''") + " }");
+      }
+    },
+
+    // [appendEscaped]
+    //
+    // On stack, before: value, ...
+    // On stack, after: ...
+    //
+    // Escape `value` and append it to the buffer
+    appendEscaped: function() {
+      this.aliases.escapeExpression = 'this.escapeExpression';
+
+      this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
+    },
+
+    // [getContext]
+    //
+    // On stack, before: ...
+    // On stack, after: ...
+    // Compiler value, after: lastContext=depth
+    //
+    // Set the value of the `lastContext` compiler value to the depth
+    getContext: function(depth) {
+      this.lastContext = depth;
+    },
+
+    // [pushContext]
+    //
+    // On stack, before: ...
+    // On stack, after: currentContext, ...
+    //
+    // Pushes the value of the current context onto the stack.
+    pushContext: function() {
+      this.pushStackLiteral(this.contextName(this.lastContext));
+    },
+
+    // [lookupOnContext]
+    //
+    // On stack, before: ...
+    // On stack, after: currentContext[name], ...
+    //
+    // Looks up the value of `name` on the current context and pushes
+    // it onto the stack.
+    lookupOnContext: function(parts, falsy, scoped) {
+      /*jshint -W083 */
+      var i = 0,
+          len = parts.length;
+
+      if (!scoped && this.options.compat && !this.lastContext) {
+        // The depthed query is expected to handle the undefined logic for the root level that
+        // is implemented below, so we evaluate that directly in compat mode
+        this.push(this.depthedLookup(parts[i++]));
+      } else {
+        this.pushContext();
+      }
+
+      for (; i < len; i++) {
+        this.replaceStack(function(current) {
+          var lookup = this.nameLookup(current, parts[i], 'context');
+          // We want to ensure that zero and false are handled properly if the context (falsy flag)
+          // needs to have the special handling for these values.
+          if (!falsy) {
+            return ' != null ? ' + lookup + ' : ' + current;
+          } else {
+            // Otherwise we can use generic falsy handling
+            return ' && ' + lookup;
+          }
+        });
+      }
+    },
+
+    // [lookupData]
+    //
+    // On stack, before: ...
+    // On stack, after: data, ...
+    //
+    // Push the data lookup operator
+    lookupData: function(depth, parts) {
+      /*jshint -W083 */
+      if (!depth) {
+        this.pushStackLiteral('data');
+      } else {
+        this.pushStackLiteral('this.data(data, ' + depth + ')');
+      }
+
+      var len = parts.length;
+      for (var i = 0; i < len; i++) {
+        this.replaceStack(function(current) {
+          return ' && ' + this.nameLookup(current, parts[i], 'data');
+        });
+      }
+    },
+
+    // [resolvePossibleLambda]
+    //
+    // On stack, before: value, ...
+    // On stack, after: resolved value, ...
+    //
+    // If the `value` is a lambda, replace it on the stack by
+    // the return value of the lambda
+    resolvePossibleLambda: function() {
+      this.aliases.lambda = 'this.lambda';
+
+      this.push('lambda(' + this.popStack() + ', ' + this.contextName(0) + ')');
+    },
+
+    // [pushStringParam]
+    //
+    // On stack, before: ...
+    // On stack, after: string, currentContext, ...
+    //
+    // This opcode is designed for use in string mode, which
+    // provides the string value of a parameter along with its
+    // depth rather than resolving it immediately.
+    pushStringParam: function(string, type) {
+      this.pushContext();
+      this.pushString(type);
+
+      // If it's a subexpression, the string result
+      // will be pushed after this opcode.
+      if (type !== 'sexpr') {
+        if (typeof string === 'string') {
+          this.pushString(string);
+        } else {
+          this.pushStackLiteral(string);
+        }
+      }
+    },
+
+    emptyHash: function() {
+      this.pushStackLiteral('{}');
+
+      if (this.trackIds) {
+        this.push('{}'); // hashIds
+      }
+      if (this.stringParams) {
+        this.push('{}'); // hashContexts
+        this.push('{}'); // hashTypes
+      }
+    },
+    pushHash: function() {
+      if (this.hash) {
+        this.hashes.push(this.hash);
+      }
+      this.hash = {values: [], types: [], contexts: [], ids: []};
+    },
+    popHash: function() {
+      var hash = this.hash;
+      this.hash = this.hashes.pop();
+
+      if (this.trackIds) {
+        this.push('{' + hash.ids.join(',') + '}');
+      }
+      if (this.stringParams) {
+        this.push('{' + hash.contexts.join(',') + '}');
+        this.push('{' + hash.types.join(',') + '}');
+      }
+
+      this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
+    },
+
+    // [pushString]
+    //
+    // On stack, before: ...
+    // On stack, after: quotedString(string), ...
+    //
+    // Push a quoted version of `string` onto the stack
+    pushString: function(string) {
+      this.pushStackLiteral(this.quotedString(string));
+    },
+
+    // [push]
+    //
+    // On stack, before: ...
+    // On stack, after: expr, ...
+    //
+    // Push an expression onto the stack
+    push: function(expr) {
+      this.inlineStack.push(expr);
+      return expr;
+    },
+
+    // [pushLiteral]
+    //
+    // On stack, before: ...
+    // On stack, after: value, ...
+    //
+    // Pushes a value onto the stack. This operation prevents
+    // the compiler from creating a temporary variable to hold
+    // it.
+    pushLiteral: function(value) {
+      this.pushStackLiteral(value);
+    },
+
+    // [pushProgram]
+    //
+    // On stack, before: ...
+    // On stack, after: program(guid), ...
+    //
+    // Push a program expression onto the stack. This takes
+    // a compile-time guid and converts it into a runtime-accessible
+    // expression.
+    pushProgram: function(guid) {
+      if (guid != null) {
+        this.pushStackLiteral(this.programExpression(guid));
+      } else {
+        this.pushStackLiteral(null);
+      }
+    },
+
+    // [invokeHelper]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of helper invocation
+    //
+    // Pops off the helper's parameters, invokes the helper,
+    // and pushes the helper's return value onto the stack.
+    //
+    // If the helper is not found, `helperMissing` is called.
+    invokeHelper: function(paramSize, name, isSimple) {
+      this.aliases.helperMissing = 'helpers.helperMissing';
+
+      var nonHelper = this.popStack();
+      var helper = this.setupHelper(paramSize, name);
+
+      var lookup = (isSimple ? helper.name + ' || ' : '') + nonHelper + ' || helperMissing';
+      this.push('((' + lookup + ').call(' + helper.callParams + '))');
+    },
+
+    // [invokeKnownHelper]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of helper invocation
+    //
+    // This operation is used when the helper is known to exist,
+    // so a `helperMissing` fallback is not required.
+    invokeKnownHelper: function(paramSize, name) {
+      var helper = this.setupHelper(paramSize, name);
+      this.push(helper.name + ".call(" + helper.callParams + ")");
+    },
+
+    // [invokeAmbiguous]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of disambiguation
+    //
+    // This operation is used when an expression like `{{foo}}`
+    // is provided, but we don't know at compile-time whether it
+    // is a helper or a path.
+    //
+    // This operation emits more code than the other options,
+    // and can be avoided by passing the `knownHelpers` and
+    // `knownHelpersOnly` flags at compile-time.
+    invokeAmbiguous: function(name, helperCall) {
+      this.aliases.functionType = '"function"';
+      this.aliases.helperMissing = 'helpers.helperMissing';
+      this.useRegister('helper');
+
+      var nonHelper = this.popStack();
+
+      this.emptyHash();
+      var helper = this.setupHelper(0, name, helperCall);
+
+      var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
+
+      this.push(
+        '((helper = (helper = ' + helperName + ' || ' + nonHelper + ') != null ? helper : helperMissing'
+          + (helper.paramsInit ? '),(' + helper.paramsInit : '') + '),'
+        + '(typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper))');
+    },
+
+    // [invokePartial]
+    //
+    // On stack, before: context, ...
+    // On stack after: result of partial invocation
+    //
+    // This operation pops off a context, invokes a partial with that context,
+    // and pushes the result of the invocation back.
+    invokePartial: function(name, indent) {
+      var params = [this.nameLookup('partials', name, 'partial'), "'" + indent + "'", "'" + name + "'", this.popStack(), this.popStack(), "helpers", "partials"];
+
+      if (this.options.data) {
+        params.push("data");
+      } else if (this.options.compat) {
+        params.push('undefined');
+      }
+      if (this.options.compat) {
+        params.push('depths');
+      }
+
+      this.push("this.invokePartial(" + params.join(", ") + ")");
+    },
+
+    // [assignToHash]
+    //
+    // On stack, before: value, ..., hash, ...
+    // On stack, after: ..., hash, ...
+    //
+    // Pops a value off the stack and assigns it to the current hash
+    assignToHash: function(key) {
+      var value = this.popStack(),
+          context,
+          type,
+          id;
+
+      if (this.trackIds) {
+        id = this.popStack();
+      }
+      if (this.stringParams) {
+        type = this.popStack();
+        context = this.popStack();
+      }
+
+      var hash = this.hash;
+      if (context) {
+        hash.contexts.push("'" + key + "': " + context);
+      }
+      if (type) {
+        hash.types.push("'" + key + "': " + type);
+      }
+      if (id) {
+        hash.ids.push("'" + key + "': " + id);
+      }
+      hash.values.push("'" + key + "': (" + value + ")");
+    },
+
+    pushId: function(type, name) {
+      if (type === 'ID' || type === 'DATA') {
+        this.pushString(name);
+      } else if (type === 'sexpr') {
+        this.pushStackLiteral('true');
+      } else {
+        this.pushStackLiteral('null');
+      }
+    },
+
+    // HELPERS
+
+    compiler: JavaScriptCompiler,
+
+    compileChildren: function(environment, options) {
+      var children = environment.children, child, compiler;
+
+      for(var i=0, l=children.length; i<l; i++) {
+        child = children[i];
+        compiler = new this.compiler();
+
+        var index = this.matchExistingProgram(child);
+
+        if (index == null) {
+          this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
+          index = this.context.programs.length;
+          child.index = index;
+          child.name = 'program' + index;
+          this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
+          this.context.environments[index] = child;
+
+          this.useDepths = this.useDepths || compiler.useDepths;
+        } else {
+          child.index = index;
+          child.name = 'program' + index;
+        }
+      }
+    },
+    matchExistingProgram: function(child) {
+      for (var i = 0, len = this.context.environments.length; i < len; i++) {
+        var environment = this.context.environments[i];
+        if (environment && environment.equals(child)) {
+          return i;
+        }
+      }
+    },
+
+    programExpression: function(guid) {
+      var child = this.environment.children[guid],
+          depths = child.depths.list,
+          useDepths = this.useDepths,
+          depth;
+
+      var programParams = [child.index, 'data'];
+
+      if (useDepths) {
+        programParams.push('depths');
+      }
+
+      return 'this.program(' + programParams.join(', ') + ')';
+    },
+
+    useRegister: function(name) {
+      if(!this.registers[name]) {
+        this.registers[name] = true;
+        this.registers.list.push(name);
+      }
+    },
+
+    pushStackLiteral: function(item) {
+      return this.push(new Literal(item));
+    },
+
+    pushSource: function(source) {
+      if (this.pendingContent) {
+        this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent)));
+        this.pendingContent = undefined;
+      }
+
+      if (source) {
+        this.source.push(source);
+      }
+    },
+
+    pushStack: function(item) {
+      this.flushInline();
+
+      var stack = this.incrStack();
+      this.pushSource(stack + " = " + item + ";");
+      this.compileStack.push(stack);
+      return stack;
+    },
+
+    replaceStack: function(callback) {
+      var prefix = '',
+          inline = this.isInline(),
+          stack,
+          createdStack,
+          usedLiteral;
+
+      /* istanbul ignore next */
+      if (!this.isInline()) {
+        throw new Exception('replaceStack on non-inline');
+      }
+
+      // We want to merge the inline statement into the replacement statement via ','
+      var top = this.popStack(true);
+
+      if (top instanceof Literal) {
+        // Literals do not need to be inlined
+        prefix = stack = top.value;
+        usedLiteral = true;
+      } else {
+        // Get or create the current stack name for use by the inline
+        createdStack = !this.stackSlot;
+        var name = !createdStack ? this.topStackName() : this.incrStack();
+
+        prefix = '(' + this.push(name) + ' = ' + top + ')';
+        stack = this.topStack();
+      }
+
+      var item = callback.call(this, stack);
+
+      if (!usedLiteral) {
+        this.popStack();
+      }
+      if (createdStack) {
+        this.stackSlot--;
+      }
+      this.push('(' + prefix + item + ')');
+    },
+
+    incrStack: function() {
+      this.stackSlot++;
+      if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
+      return this.topStackName();
+    },
+    topStackName: function() {
+      return "stack" + this.stackSlot;
+    },
+    flushInline: function() {
+      var inlineStack = this.inlineStack;
+      if (inlineStack.length) {
+        this.inlineStack = [];
+        for (var i = 0, len = inlineStack.length; i < len; i++) {
+          var entry = inlineStack[i];
+          if (entry instanceof Literal) {
+            this.compileStack.push(entry);
+          } else {
+            this.pushStack(entry);
+          }
+        }
+      }
+    },
+    isInline: function() {
+      return this.inlineStack.length;
+    },
+
+    popStack: function(wrapped) {
+      var inline = this.isInline(),
+          item = (inline ? this.inlineStack : this.compileStack).pop();
+
+      if (!wrapped && (item instanceof Literal)) {
+        return item.value;
+      } else {
+        if (!inline) {
+          /* istanbul ignore next */
+          if (!this.stackSlot) {
+            throw new Exception('Invalid stack pop');
+          }
+          this.stackSlot--;
+        }
+        return item;
+      }
+    },
+
+    topStack: function() {
+      var stack = (this.isInline() ? this.inlineStack : this.compileStack),
+          item = stack[stack.length - 1];
+
+      if (item instanceof Literal) {
+        return item.value;
+      } else {
+        return item;
+      }
+    },
+
+    contextName: function(context) {
+      if (this.useDepths && context) {
+        return 'depths[' + context + ']';
+      } else {
+        return 'depth' + context;
+      }
+    },
+
+    quotedString: function(str) {
+      return '"' + str
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\n/g, '\\n')
+        .replace(/\r/g, '\\r')
+        .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
+        .replace(/\u2029/g, '\\u2029') + '"';
+    },
+
+    objectLiteral: function(obj) {
+      var pairs = [];
+
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          pairs.push(this.quotedString(key) + ':' + obj[key]);
+        }
+      }
+
+      return '{' + pairs.join(',') + '}';
+    },
+
+    setupHelper: function(paramSize, name, blockHelper) {
+      var params = [],
+          paramsInit = this.setupParams(name, paramSize, params, blockHelper);
+      var foundHelper = this.nameLookup('helpers', name, 'helper');
+
+      return {
+        params: params,
+        paramsInit: paramsInit,
+        name: foundHelper,
+        callParams: [this.contextName(0)].concat(params).join(", ")
+      };
+    },
+
+    setupOptions: function(helper, paramSize, params) {
+      var options = {}, contexts = [], types = [], ids = [], param, inverse, program;
+
+      options.name = this.quotedString(helper);
+      options.hash = this.popStack();
+
+      if (this.trackIds) {
+        options.hashIds = this.popStack();
+      }
+      if (this.stringParams) {
+        options.hashTypes = this.popStack();
+        options.hashContexts = this.popStack();
+      }
+
+      inverse = this.popStack();
+      program = this.popStack();
+
+      // Avoid setting fn and inverse if neither are set. This allows
+      // helpers to do a check for `if (options.fn)`
+      if (program || inverse) {
+        if (!program) {
+          program = 'this.noop';
+        }
+
+        if (!inverse) {
+          inverse = 'this.noop';
+        }
+
+        options.fn = program;
+        options.inverse = inverse;
+      }
+
+      // The parameters go on to the stack in order (making sure that they are evaluated in order)
+      // so we need to pop them off the stack in reverse order
+      var i = paramSize;
+      while (i--) {
+        param = this.popStack();
+        params[i] = param;
+
+        if (this.trackIds) {
+          ids[i] = this.popStack();
+        }
+        if (this.stringParams) {
+          types[i] = this.popStack();
+          contexts[i] = this.popStack();
+        }
+      }
+
+      if (this.trackIds) {
+        options.ids = "[" + ids.join(",") + "]";
+      }
+      if (this.stringParams) {
+        options.types = "[" + types.join(",") + "]";
+        options.contexts = "[" + contexts.join(",") + "]";
+      }
+
+      if (this.options.data) {
+        options.data = "data";
+      }
+
+      return options;
+    },
+
+    // the params and contexts arguments are passed in arrays
+    // to fill in
+    setupParams: function(helperName, paramSize, params, useRegister) {
+      var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params));
+
+      if (useRegister) {
+        this.useRegister('options');
+        params.push('options');
+        return 'options=' + options;
+      } else {
+        params.push(options);
+        return '';
+      }
+    }
+  };
+
+  var reservedWords = (
+    "break else new var" +
+    " case finally return void" +
+    " catch for switch while" +
+    " continue function this with" +
+    " default if throw" +
+    " delete in try" +
+    " do instanceof typeof" +
+    " abstract enum int short" +
+    " boolean export interface static" +
+    " byte extends long super" +
+    " char final native synchronized" +
+    " class float package throws" +
+    " const goto private transient" +
+    " debugger implements protected volatile" +
+    " double import public let yield"
+  ).split(" ");
+
+  var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
+
+  for(var i=0, l=reservedWords.length; i<l; i++) {
+    compilerWords[reservedWords[i]] = true;
+  }
+
+  JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
+    return !JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name);
+  };
+
+  __exports__ = JavaScriptCompiler;
+  return __exports__;
+})(__module2__, __module5__);
+
+// handlebars.js
+var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  "use strict";
+  var __exports__;
+  /*globals Handlebars: true */
+  var Handlebars = __dependency1__;
+
+  // Compiler imports
+  var AST = __dependency2__;
+  var Parser = __dependency3__.parser;
+  var parse = __dependency3__.parse;
+  var Compiler = __dependency4__.Compiler;
+  var compile = __dependency4__.compile;
+  var precompile = __dependency4__.precompile;
+  var JavaScriptCompiler = __dependency5__;
+
+  var _create = Handlebars.create;
+  var create = function() {
+    var hb = _create();
+
+    hb.compile = function(input, options) {
+      return compile(input, options, hb);
+    };
+    hb.precompile = function (input, options) {
+      return precompile(input, options, hb);
+    };
+
+    hb.AST = AST;
+    hb.Compiler = Compiler;
+    hb.JavaScriptCompiler = JavaScriptCompiler;
+    hb.Parser = Parser;
+    hb.parse = parse;
+
+    return hb;
+  };
+
+  Handlebars = create();
+  Handlebars.create = create;
+
+  Handlebars['default'] = Handlebars;
+
+  __exports__ = Handlebars;
+  return __exports__;
+})(__module1__, __module7__, __module8__, __module11__, __module12__);
+
+  return __module0__;
+}));
diff --git a/kcov-38/data/js/jquery.min.js b/kcov-38/data/js/jquery.min.js
new file mode 100644
index 000000000000..e5ace116b6f5
--- /dev/null
+++ b/kcov-38/data/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
+},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
+},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Ic=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Jc})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Lc=a.jQuery,Mc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Mc),b&&a.jQuery===n&&(a.jQuery=Lc),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/kcov-38/data/js/jquery.tablesorter.min.js b/kcov-38/data/js/jquery.tablesorter.min.js
new file mode 100644
index 000000000000..0c52bdc0ed9a
--- /dev/null
+++ b/kcov-38/data/js/jquery.tablesorter.min.js
@@ -0,0 +1,5 @@
+/*!
+* TableSorter 2.17.1 min - Client-side table sorting with ease!
+* Copyright (c) 2007 Christian Bach
+*/
+!(function(g){g.extend({tablesorter:new function(){function d(){var b=arguments[0],a=1<arguments.length?Array.prototype.slice.call(arguments):b;if("undefined"!==typeof console&&"undefined"!==typeof console.log)console[/error/i.test(b)?"error":/warn/i.test(b)?"warn":"log"](a);else alert(a)}function v(b,a){d(b+" ("+((new Date).getTime()-a.getTime())+"ms)")}function p(b){for(var a in b)return!1;return!0}function n(b,a,c){if(!a)return"";var h,e=b.config,r=e.textExtraction||"",k="",k="basic"===r?g(a).attr(e.textAttribute)|| a.textContent||a.innerText||g(a).text()||"":"function"===typeof r?r(a,b,c):"function"===typeof(h=f.getColumnData(b,r,c))?h(a,b,c):a.textContent||a.innerText||g(a).text()||"";return g.trim(k)}function t(b){var a=b.config,c=a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),h,e,r,k,l,m,g,u,p,q=0,s="",t=c.length;if(0===t)return a.debug?d("Warning: *Empty table!* Not building a parser cache"):"";a.debug&&(p=new Date,d("Detecting parsers for each column"));for(e=[];q<t;){h=c[q].rows;if(h[q])for(r= a.columns,k=0;k<r;k++){l=a.$headers.filter('[data-column="'+k+'"]:last');m=f.getColumnData(b,a.headers,k);u=f.getParserById(f.getData(l,m,"sorter"));g="false"===f.getData(l,m,"parser");a.empties[k]=f.getData(l,m,"empty")||a.emptyTo||(a.emptyToBottom?"bottom":"top");a.strings[k]=f.getData(l,m,"string")||a.stringTo||"max";g&&(u=f.getParserById("no-parser"));if(!u)a:{l=b;m=h;g=-1;u=k;for(var A=void 0,x=f.parsers.length,z=!1,F="",A=!0;""===F&&A;)g++,m[g]?(z=m[g].cells[u],F=n(l,z,u),l.config.debug&&d("Checking if value was empty on row "+ g+", column: "+u+': "'+F+'"')):A=!1;for(;0<=--x;)if((A=f.parsers[x])&&"text"!==A.id&&A.is&&A.is(F,l,z)){u=A;break a}u=f.getParserById("text")}a.debug&&(s+="column:"+k+"; parser:"+u.id+"; string:"+a.strings[k]+"; empty: "+a.empties[k]+"\n");e[k]=u}q+=e.length?t:1}a.debug&&(d(s?s:"No parsers detected"),v("Completed detecting parsers",p));a.parsers=e}function x(b){var a,c,h,e,r,k,l,m,y,u,p,q=b.config,s=q.$table.children("tbody"),t=q.parsers;q.cache={};if(!t)return q.debug?d("Warning: *Empty table!* Not building a cache"): "";q.debug&&(m=new Date);q.showProcessing&&f.isProcessing(b,!0);for(r=0;r<s.length;r++)if(p=[],a=q.cache[r]={normalized:[]},!s.eq(r).hasClass(q.cssInfoBlock)){y=s[r]&&s[r].rows.length||0;for(h=0;h<y;++h)if(u={child:[]},k=g(s[r].rows[h]),l=[],k.hasClass(q.cssChildRow)&&0!==h)c=a.normalized.length-1,a.normalized[c][q.columns].$row=a.normalized[c][q.columns].$row.add(k),k.prev().hasClass(q.cssChildRow)||k.prev().addClass(f.css.cssHasChild),u.child[c]=g.trim(k[0].textContent||k[0].innerText||k.text()|| "");else{u.$row=k;u.order=h;for(e=0;e<q.columns;++e)"undefined"===typeof t[e]?q.debug&&d("No parser found for cell:",k[0].cells[e],"does it have a header?"):(c=n(b,k[0].cells[e],e),c="no-parser"===t[e].id?"":t[e].format(c,b,k[0].cells[e],e),l.push(c),"numeric"===(t[e].type||"").toLowerCase()&&(p[e]=Math.max(Math.abs(c)||0,p[e]||0)));l[q.columns]=u;a.normalized.push(l)}a.colMax=p}q.showProcessing&&f.isProcessing(b);q.debug&&v("Building cache for "+y+" rows",m)}function z(b,a){var c=b.config,h=c.widgetOptions, e=b.tBodies,r=[],k=c.cache,d,m,y,u,n,q;if(p(k))return c.appender?c.appender(b,r):b.isUpdating?c.$table.trigger("updateComplete",b):"";c.debug&&(q=new Date);for(n=0;n<e.length;n++)if(d=g(e[n]),d.length&&!d.hasClass(c.cssInfoBlock)){y=f.processTbody(b,d,!0);d=k[n].normalized;m=d.length;for(u=0;u<m;u++)r.push(d[u][c.columns].$row),c.appender&&(!c.pager||c.pager.removeRows&&h.pager_removeRows||c.pager.ajax)||y.append(d[u][c.columns].$row);f.processTbody(b,y,!1)}c.appender&&c.appender(b,r);c.debug&&v("Rebuilt table", q);a||c.appender||f.applyWidget(b);b.isUpdating&&c.$table.trigger("updateComplete",b)}function C(b){return/^d/i.test(b)||1===b}function D(b){var a,c,h,e,r,k,l,m=b.config;m.headerList=[];m.headerContent=[];m.debug&&(l=new Date);m.columns=f.computeColumnIndex(m.$table.children("thead, tfoot").children("tr"));e=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers.each(function(d){c=g(this);a=f.getColumnData(b,m.headers,d,!0);m.headerContent[d]=g(this).html(); r=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,e);m.onRenderTemplate&&(h=m.onRenderTemplate.apply(c,[d,r]))&&"string"===typeof h&&(r=h);g(this).html('<div class="'+f.css.headerIn+'">'+r+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(c,[d]);this.column=parseInt(g(this).attr("data-column"),10);this.order=C(f.getData(c,a,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder=!1;k=f.getData(c,a,"lockedOrder")||!1;"undefined"!==typeof k&& !1!==k&&(this.order=this.lockedOrder=C(k)?[1,1,1]:[0,0,0]);c.addClass(f.css.header+" "+m.cssHeader);m.headerList[d]=this;c.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow).attr("role","row");m.tabIndex&&c.attr("tabindex",0)}).attr({scope:"col",role:"columnheader"});B(b);m.debug&&(v("Built headers:",l),d(m.$headers))}function E(b,a,c){var h=b.config;h.$table.find(h.selectorRemove).remove();t(b);x(b);H(h.$table,a,c)}function B(b){var a,c,h=b.config;h.$headers.each(function(e,r){c=g(r);a="false"=== f.getData(r,f.getColumnData(b,h.headers,e,!0),"sorter");r.sortDisabled=a;c[a?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+a);b.id&&(a?c.removeAttr("aria-controls"):c.attr("aria-controls",b.id))})}function G(b){var a,c,h=b.config,e=h.sortList,r=e.length,d=f.css.sortNone+" "+h.cssNone,l=[f.css.sortAsc+" "+h.cssAsc,f.css.sortDesc+" "+h.cssDesc],m=["ascending","descending"],y=g(b).find("tfoot tr").children().add(h.$extraHeaders).removeClass(l.join(" "));h.$headers.removeClass(l.join(" ")).addClass(d).attr("aria-sort", "none");for(a=0;a<r;a++)if(2!==e[a][1]&&(b=h.$headers.not(".sorter-false").filter('[data-column="'+e[a][0]+'"]'+(1===r?":last":"")),b.length)){for(c=0;c<b.length;c++)b[c].sortDisabled||b.eq(c).removeClass(d).addClass(l[e[a][1]]).attr("aria-sort",m[e[a][1]]);y.length&&y.filter('[data-column="'+e[a][0]+'"]').removeClass(d).addClass(l[e[a][1]])}h.$headers.not(".sorter-false").each(function(){var b=g(this),a=this.order[(this.count+1)%(h.sortReset?3:2)],a=b.text()+": "+f.language[b.hasClass(f.css.sortAsc)? "sortAsc":b.hasClass(f.css.sortDesc)?"sortDesc":"sortNone"]+f.language[0===a?"nextAsc":1===a?"nextDesc":"nextNone"];b.attr("aria-label",a)})}function L(b){if(b.config.widthFixed&&0===g(b).find("colgroup").length){var a=g("<colgroup>"),c=g(b).width();g(b.tBodies[0]).find("tr:first").children("td:visible").each(function(){a.append(g("<col>").css("width",parseInt(g(this).width()/c*1E3,10)/10+"%"))});g(b).prepend(a)}}function M(b,a){var c,h,e,f,d,l=b.config,m=a||l.sortList;l.sortList=[];g.each(m,function(b, a){f=parseInt(a[0],10);if(e=l.$headers.filter('[data-column="'+f+'"]:last')[0]){h=(h=(""+a[1]).match(/^(1|d|s|o|n)/))?h[0]:"";switch(h){case "1":case "d":h=1;break;case "s":h=d||0;break;case "o":c=e.order[(d||0)%(l.sortReset?3:2)];h=0===c?1:1===c?0:2;break;case "n":e.count+=1;h=e.order[e.count%(l.sortReset?3:2)];break;default:h=0}d=0===b?h:d;c=[f,parseInt(h,10)||0];l.sortList.push(c);h=g.inArray(c[1],e.order);e.count=0<=h?h:c[1]%(l.sortReset?3:2)}})}function N(b,a){return b&&b[a]?b[a].type||"":""} function O(b,a,c){var h,e,d,k=b.config,l=!c[k.sortMultiSortKey],m=k.$table;m.trigger("sortStart",b);a.count=c[k.sortResetKey]?2:(a.count+1)%(k.sortReset?3:2);k.sortRestart&&(e=a,k.$headers.each(function(){this===e||!l&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=a.column;if(l){k.sortList=[];if(null!==k.sortForce)for(h=k.sortForce,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);h=a.order[a.count];if(2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+ c,h])}else{if(k.sortAppend&&1<k.sortList.length)for(c=0;c<k.sortAppend.length;c++)d=f.isValueInArray(k.sortAppend[c][0],k.sortList),0<=d&&k.sortList.splice(d,1);if(0<=f.isValueInArray(e,k.sortList))for(c=0;c<k.sortList.length;c++)d=k.sortList[c],h=k.$headers.filter('[data-column="'+d[0]+'"]:last')[0],d[0]===e&&(d[1]=h.order[a.count],2===d[1]&&(k.sortList.splice(c,1),h.count=-1));else if(h=a.order[a.count],2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+c,h])}if(null!== k.sortAppend)for(h=k.sortAppend,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);m.trigger("sortBegin",b);setTimeout(function(){G(b);I(b);z(b);m.trigger("sortEnd",b)},1)}function I(b){var a,c,h,e,d,k,g,m,y,n,t,q=0,s=b.config,w=s.textSorter||"",x=s.sortList,z=x.length,B=b.tBodies.length;if(!s.serverSideSorting&&!p(s.cache)){s.debug&&(d=new Date);for(c=0;c<B;c++)k=s.cache[c].colMax,g=s.cache[c].normalized,g.sort(function(c,d){for(a=0;a<z;a++){e=x[a][0];m=x[a][1];q=0===m;if(s.sortStable&&c[e]=== d[e]&&1===z)break;(h=/n/i.test(N(s.parsers,e)))&&s.strings[e]?(h="boolean"===typeof s.string[s.strings[e]]?(q?1:-1)*(s.string[s.strings[e]]?-1:1):s.strings[e]?s.string[s.strings[e]]||0:0,y=s.numberSorter?s.numberSorter(c[e],d[e],q,k[e],b):f["sortNumeric"+(q?"Asc":"Desc")](c[e],d[e],h,k[e],e,b)):(n=q?c:d,t=q?d:c,y="function"===typeof w?w(n[e],t[e],q,e,b):"object"===typeof w&&w.hasOwnProperty(e)?w[e](n[e],t[e],q,e,b):f["sortNatural"+(q?"Asc":"Desc")](c[e],d[e],e,b,s));if(y)return y}return c[s.columns].order- d[s.columns].order});s.debug&&v("Sorting on "+x.toString()+" and dir "+m+" time",d)}}function J(b,a){b[0].isUpdating&&b.trigger("updateComplete");g.isFunction(a)&&a(b[0])}function H(b,a,c){var h=b[0].config.sortList;!1!==a&&!b[0].isProcessing&&h.length?b.trigger("sorton",[h,function(){J(b,c)},!0]):(J(b,c),f.applyWidget(b[0],!1))}function K(b){var a=b.config,c=a.$table;c.unbind("sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(a.namespace+ " ")).bind("sortReset"+a.namespace,function(c,e){c.stopPropagation();a.sortList=[];G(b);I(b);z(b);g.isFunction(e)&&e(b)}).bind("updateAll"+a.namespace,function(c,e,d){c.stopPropagation();b.isUpdating=!0;f.refreshWidgets(b,!0,!0);f.restoreHeaders(b);D(b);f.bindEvents(b,a.$headers,!0);K(b);E(b,e,d)}).bind("update"+a.namespace+" updateRows"+a.namespace,function(a,c,d){a.stopPropagation();b.isUpdating=!0;B(b);E(b,c,d)}).bind("updateCell"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating= !0;c.find(a.selectorRemove).remove();var l,m;l=c.find("tbody");m=g(e);h=l.index(g.fn.closest?m.closest("tbody"):m.parents("tbody").filter(":first"));var p=g.fn.closest?m.closest("tr"):m.parents("tr").filter(":first");e=m[0];l.length&&0<=h&&(l=l.eq(h).find("tr").index(p),m=m.index(),a.cache[h].normalized[l][a.columns].$row=p,e=a.cache[h].normalized[l][m]="no-parser"===a.parsers[m].id?"":a.parsers[m].format(n(b,e,m),b,e,m),"numeric"===(a.parsers[m].type||"").toLowerCase()&&(a.cache[h].colMax[m]=Math.max(Math.abs(e)|| 0,a.cache[h].colMax[m]||0)),H(c,d,f))}).bind("addRows"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating=!0;if(p(a.cache))B(b),E(b,d,f);else{e=g(e);var l,m,v,u,x=e.filter("tr").length,q=c.find("tbody").index(e.parents("tbody").filter(":first"));a.parsers&&a.parsers.length||t(b);for(h=0;h<x;h++){m=e[h].cells.length;u=[];v={child:[],$row:e.eq(h),order:a.cache[q].normalized.length};for(l=0;l<m;l++)u[l]="no-parser"===a.parsers[l].id?"":a.parsers[l].format(n(b,e[h].cells[l],l),b,e[h].cells[l], l),"numeric"===(a.parsers[l].type||"").toLowerCase()&&(a.cache[q].colMax[l]=Math.max(Math.abs(u[l])||0,a.cache[q].colMax[l]||0));u.push(v);a.cache[q].normalized.push(u)}H(c,d,f)}}).bind("updateComplete"+a.namespace,function(){b.isUpdating=!1}).bind("sorton"+a.namespace,function(a,e,d,k){var l=b.config;a.stopPropagation();c.trigger("sortStart",this);M(b,e);G(b);l.delayInit&&p(l.cache)&&x(b);c.trigger("sortBegin",this);I(b);z(b,k);c.trigger("sortEnd",this);f.applyWidget(b);g.isFunction(d)&&d(b)}).bind("appendCache"+ a.namespace,function(a,c,d){a.stopPropagation();z(b,d);g.isFunction(c)&&c(b)}).bind("updateCache"+a.namespace,function(c,e){a.parsers&&a.parsers.length||t(b);x(b);g.isFunction(e)&&e(b)}).bind("applyWidgetId"+a.namespace,function(c,e){c.stopPropagation();f.getWidgetById(e).format(b,a,a.widgetOptions)}).bind("applyWidgets"+a.namespace,function(a,c){a.stopPropagation();f.applyWidget(b,c)}).bind("refreshWidgets"+a.namespace,function(a,c,d){a.stopPropagation();f.refreshWidgets(b,c,d)}).bind("destroy"+ a.namespace,function(a,c,d){a.stopPropagation();f.destroy(b,c,d)}).bind("resetToLoadState"+a.namespace,function(){f.refreshWidgets(b,!0,!0);a=g.extend(!0,f.defaults,a.originalSettings);b.hasInitialized=!1;f.setup(b,a)})}var f=this;f.version="2.17.1";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey", usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow", cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc", sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"};f.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"};f.log=d;f.benchmark=v;f.construct=function(b){return this.each(function(){var a=g.extend(!0,{},f.defaults,b);a.originalSettings=b;!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName? f.buildTable(this,a):f.setup(this,a)})};f.setup=function(b,a){if(!b||!b.tHead||0===b.tBodies.length||!0===b.hasInitialized)return a.debug?d("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var c="",h=g(b),e=g.metadata;b.hasInitialized=!1;b.isProcessing=!0;b.config=a;g.data(b,"tablesorter",a);a.debug&&g.data(b,"startoveralltimer",new Date);a.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(g.fn.jquery.split(".")); a.string={max:1,min:-1,emptyMin:1,emptyMax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(c=""!==a.theme?" tablesorter-"+a.theme:"");a.$table=h.addClass(f.css.table+" "+a.tableClass+c).attr({role:"grid"});a.$headers=g(b).find(a.selectorHeaders);a.namespace=a.namespace?"."+a.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2);a.$tbodies=h.children("tbody:not(."+a.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"});a.$table.find("caption").length&& a.$table.attr("aria-labelledby","theCaption");a.widgetInit={};a.textExtraction=a.$table.attr("data-text-extraction")||a.textExtraction||"basic";D(b);L(b);t(b);a.delayInit||x(b);f.bindEvents(b,a.$headers,!0);K(b);a.supportsDataObject&&"undefined"!==typeof h.data().sortlist?a.sortList=h.data().sortlist:e&&h.metadata()&&h.metadata().sortlist&&(a.sortList=h.metadata().sortlist);f.applyWidget(b,!0);0<a.sortList.length?h.trigger("sorton",[a.sortList,{},!a.initWidgets,!0]):(G(b),a.initWidgets&&f.applyWidget(b, !1));a.showProcessing&&h.unbind("sortBegin"+a.namespace+" sortEnd"+a.namespace).bind("sortBegin"+a.namespace+" sortEnd"+a.namespace,function(c){clearTimeout(a.processTimer);f.isProcessing(b);"sortBegin"===c.type&&(a.processTimer=setTimeout(function(){f.isProcessing(b,!0)},500))});b.hasInitialized=!0;b.isProcessing=!1;a.debug&&f.benchmark("Overall initialization time",g.data(b,"startoveralltimer"));h.trigger("tablesorter-initialized",b);"function"===typeof a.initialized&&a.initialized(b)};f.getColumnData= function(b,a,c,h){if("undefined"!==typeof a&&null!==a){b=g(b)[0];var e,d=b.config;if(a[c])return h?a[c]:a[d.$headers.index(d.$headers.filter('[data-column="'+c+'"]:last'))];for(e in a)if("string"===typeof e&&(b=h?d.$headers.eq(c).filter(e):d.$headers.filter('[data-column="'+c+'"]:last').filter(e),b.length))return a[e]}};f.computeColumnIndex=function(b){var a=[],c=0,h,e,d,f,l,m,p,v,n,q;for(h=0;h<b.length;h++)for(l=b[h].cells,e=0;e<l.length;e++){d=l[e];f=g(d);m=d.parentNode.rowIndex;f.index();p=d.rowSpan|| 1;v=d.colSpan||1;"undefined"===typeof a[m]&&(a[m]=[]);for(d=0;d<a[m].length+1;d++)if("undefined"===typeof a[m][d]){n=d;break}c=Math.max(n,c);f.attr({"data-column":n});for(d=m;d<m+p;d++)for("undefined"===typeof a[d]&&(a[d]=[]),q=a[d],f=n;f<n+v;f++)q[f]="x"}return c+1};f.isProcessing=function(b,a,c){b=g(b);var d=b[0].config;b=c||b.find("."+f.css.header);a?("undefined"!==typeof c&&0<d.sortList.length&&(b=b.filter(function(){return this.sortDisabled?!1:0<=f.isValueInArray(parseFloat(g(this).attr("data-column")), d.sortList)})),b.addClass(f.css.processing+" "+d.cssProcessing)):b.removeClass(f.css.processing+" "+d.cssProcessing)};f.processTbody=function(b,a,c){b=g(b)[0];if(c)return b.isProcessing=!0,a.before('<span class="tablesorter-savemyplace"/>'),c=g.fn.detach?a.detach():a.remove();c=g(b).find("span.tablesorter-savemyplace");a.insertAfter(c);c.remove();b.isProcessing=!1};f.clearTableBody=function(b){g(b)[0].config.$tbodies.detach()};f.bindEvents=function(b,a,c){b=g(b)[0];var d,e=b.config;!0!==c&&(e.$extraHeaders= e.$extraHeaders?e.$extraHeaders.add(a):a);a.find(e.selectorSort).add(a.filter(e.selectorSort)).unbind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" ")).bind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" "),function(c,f){var l;l=c.type;if(!(1!==(c.which||c.button)&&!/sort|keyup/.test(l)||"keyup"===l&&13!==c.which||"mouseup"===l&&!0!==f&&250<(new Date).getTime()-d)){if("mousedown"===l)return d=(new Date).getTime(),/(input|select|button|textarea)/i.test(c.target.tagName)? "":!e.cancelSelection;e.delayInit&&p(e.cache)&&x(b);l=g.fn.closest?g(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:g(this).parents("th, td")[0];l=e.$headers[a.index(l)];l.sortDisabled||O(b,l,c)}});e.cancelSelection&&a.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})};f.restoreHeaders=function(b){var a=g(b)[0].config;a.$table.find(a.selectorHeaders).each(function(b){g(this).find("."+f.css.headerIn).length&&g(this).html(a.headerContent[b])})}; f.destroy=function(b,a,c){b=g(b)[0];if(b.hasInitialized){f.refreshWidgets(b,!0,!0);var d=g(b),e=b.config,r=d.find("thead:first"),k=r.find("tr."+f.css.headerRow).removeClass(f.css.headerRow+" "+e.cssHeaderRow),l=d.find("tfoot:first > tr").children("th, td");!1===a&&0<=g.inArray("uitheme",e.widgets)&&(d.trigger("applyWidgetId",["uitheme"]),d.trigger("applyWidgetId",["zebra"]));r.find("tr").not(k).remove();d.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(e.namespace+ " "));e.$headers.add(l).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc,f.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true");k.find(e.selectorSort).unbind(["mousedown","mouseup","keypress",""].join(e.namespace+" "));f.restoreHeaders(b);d.toggleClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme,!1===a);b.hasInitialized=!1;delete b.config.cache;"function"===typeof c&&c(b)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(b,a){if(b===a)return 0;var c,d,e,g,k,l;d=f.regex;if(d.hex.test(a)){c=parseInt(b.match(d.hex),16);e=parseInt(a.match(d.hex),16);if(c<e)return-1;if(c>e)return 1}c=b.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");d=a.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");l=Math.max(c.length,d.length);for(k=0;k<l;k++){e=isNaN(c[k])?c[k]||0:parseFloat(c[k])||0;g=isNaN(d[k])?d[k]||0:parseFloat(d[k])||0;if(isNaN(e)!== isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:-c||-1:""===a&&0!==c?"boolean"===typeof c?c?1:-1:c||1:f.sortNatural(b,a)};f.sortNaturalDesc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:c||1:""===a&&0!==c?"boolean"===typeof c?c? 1:-1:-c||-1:f.sortNatural(a,b)};f.sortText=function(b,a){return b>a?1:b<a?-1:0};f.getTextValue=function(b,a,c){if(c){var d=b?b.length:0,e=c+a;for(c=0;c<d;c++)e+=b.charCodeAt(c);return a*e}return 0};f.sortNumericAsc=function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return b-a};f.sortNumericDesc= function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return a-b};f.sortNumeric=function(b,a){return b-a};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119", E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var a,c="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(a in d)"string"===typeof a&&(c+=d[a],f.characterRegexArray[a]=new RegExp("["+d[a]+"]","g"));f.characterRegex= new RegExp(c+"]")}if(f.characterRegex.test(b))for(a in d)"string"===typeof a&&(b=b.replace(f.characterRegexArray[a],a));return b};f.isValueInArray=function(b,a){var c,d=a.length;for(c=0;c<d;c++)if(a[c][0]===b)return c;return-1};f.addParser=function(b){var a,c=f.parsers.length,d=!0;for(a=0;a<c;a++)f.parsers[a].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){if("false"==b)return!1;var a,c=f.parsers.length;for(a=0;a<c;a++)if(f.parsers[a].id.toLowerCase()=== b.toString().toLowerCase())return f.parsers[a];return!1};f.addWidget=function(b){f.widgets.push(b)};f.getWidgetById=function(b){var a,c,d=f.widgets.length;for(a=0;a<d;a++)if((c=f.widgets[a])&&c.hasOwnProperty("id")&&c.id.toLowerCase()===b.toLowerCase())return c};f.applyWidget=function(b,a){b=g(b)[0];var c=b.config,d=c.widgetOptions,e=[],p,k,l;!1!==a&&b.hasInitialized&&(b.isApplyingWidgets||b.isUpdating)||(c.debug&&(p=new Date),c.widgets.length&&(b.isApplyingWidgets=!0,c.widgets=g.grep(c.widgets,function(a, b){return g.inArray(a,c.widgets)===b}),g.each(c.widgets||[],function(a,b){(l=f.getWidgetById(b))&&l.id&&(l.priority||(l.priority=10),e[a]=l)}),e.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(a||!c.widgetInit[f.id])f.hasOwnProperty("options")&&(d=b.config.widgetOptions=g.extend(!0,{},f.options,d)),f.hasOwnProperty("init")&&f.init(b,f,c,d),c.widgetInit[f.id]=!0;!a&&f.hasOwnProperty("format")&&f.format(b,c,d,!1)}})),setTimeout(function(){b.isApplyingWidgets= !1},0),c.debug&&(k=c.widgets.length,v("Completed "+(!0===a?"initializing ":"applying ")+k+" widget"+(1!==k?"s":""),p)))};f.refreshWidgets=function(b,a,c){b=g(b)[0];var h,e=b.config,p=e.widgets,k=f.widgets,l=k.length;for(h=0;h<l;h++)k[h]&&k[h].id&&(a||0>g.inArray(k[h].id,p))&&(e.debug&&d('Refeshing widgets: Removing "'+k[h].id+'"'),k[h].hasOwnProperty("remove")&&e.widgetInit[k[h].id]&&(k[h].remove(b,e,e.widgetOptions),e.widgetInit[k[h].id]=!1));!0!==c&&f.applyWidget(b,a)};f.getData=function(b,a,c){var d= "";b=g(b);var e,f;if(!b.length)return"";e=g.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(c)||"undefined"!==typeof b.data(c.toLowerCase())?d+=b.data(c)||b.data(c.toLowerCase()):e&&"undefined"!==typeof e[c]?d+=e[c]:a&&"undefined"!==typeof a[c]?d+=a[c]:" "!==f&&f.match(" "+c+"-")&&(d=f.match(new RegExp("\\s"+c+"-([\\w-]+)"))[1]||"");return g.trim(d)};f.formatFloat=function(b,a){if("string"!==typeof b||""===b)return b;var c;b=(a&&a.config?!1!==a.config.usNumberFormat: "undefined"!==typeof a?a:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(b);return isNaN(c)?g.trim(b):c};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,"")):!0}}});var n=g.tablesorter;g.fn.extend({tablesorter:n.construct});n.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"});n.addParser({id:"text",is:function(){return!0}, format:function(d,v){var p=v.config;d&&(d=g.trim(p.ignoreCase?d.toLocaleLowerCase():d),d=p.sortLocaleCompare?n.replaceAccents(d):d);return d},type:"text"});n.addParser({id:"digit",is:function(d){return n.isDigit(d)},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"currency",is:function(d){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((d|| "").replace(/[+\-,. ]/g,""))},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"ipAddress",is:function(d){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(d)},format:function(d,g){var p,w=d?d.split("."):"",t="",x=w.length;for(p=0;p<x;p++)t+=("00"+w[p]).slice(-3);return d?n.formatFloat(t,g):d},type:"numeric"});n.addParser({id:"url",is:function(d){return/^(https?|ftp|file):\/\//.test(d)}, format:function(d){return d?g.trim(d.replace(/(https?|ftp|file):\/\//,"")):d},type:"text"});n.addParser({id:"isoDate",is:function(d){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(d)},format:function(d,g){return d?n.formatFloat(""!==d?(new Date(d.replace(/-/g,"/"))).getTime()||d:"",g):d},type:"numeric"});n.addParser({id:"percent",is:function(d){return/(\d\s*?%|%\s*?\d)/.test(d)&&15>d.length},format:function(d,g){return d?n.formatFloat(d.replace(/%/g,""),g):d},type:"numeric"});n.addParser({id:"usLongDate", is:function(d){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(d)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date(d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"shortDate",is:function(d){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((d||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(d,g,p,w){if(d){p=g.config; var t=p.$headers.filter("[data-column="+w+"]:last");w=t.length&&t[0].dateFormat||n.getData(t,n.getColumnData(g,p.headers,w),"dateFormat")||p.dateFormat;d=d.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===w&&(d=d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return d?n.formatFloat((new Date(d)).getTime()||d,g):d},type:"numeric"}); n.addParser({id:"time",is:function(d){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date("2000/01/01 "+d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"metadata",is:function(){return!1},format:function(d,n,p){d=n.config;d=d.parserMetadataName?d.parserMetadataName:"sortValue";return g(p).metadata()[d]},type:"numeric"});n.addWidget({id:"zebra",priority:90,format:function(d,v,p){var w,t, x,z,C,D,E=new RegExp(v.cssChildRow,"i"),B=v.$tbodies;v.debug&&(C=new Date);for(d=0;d<B.length;d++)w=B.eq(d),D=w.children("tr").length,1<D&&(x=0,w=w.children("tr:visible").not(v.selectorRemove),w.each(function(){t=g(this);E.test(this.className)||x++;z=0===x%2;t.removeClass(p.zebra[z?1:0]).addClass(p.zebra[z?0:1])}));v.debug&&n.benchmark("Applying Zebra widget",C)},remove:function(d,n,p){var w;n=n.$tbodies;var t=(p.zebra||["even","odd"]).join(" ");for(p=0;p<n.length;p++)w=g.tablesorter.processTbody(d, n.eq(p),!0),w.children().removeClass(t),g.tablesorter.processTbody(d,w,!1)}})})(jQuery);
diff --git a/kcov-38/data/js/jquery.tablesorter.widgets.min.js b/kcov-38/data/js/jquery.tablesorter.widgets.min.js
new file mode 100644
index 000000000000..44fe73be994f
--- /dev/null
+++ b/kcov-38/data/js/jquery.tablesorter.widgets.min.js
@@ -0,0 +1,17 @@
+/*! tableSorter 2.16+ widgets - updated 5/28/2014 (v2.17.1) */
+;(function(k){
+var c=k.tablesorter=k.tablesorter||{};
+c.themes={bootstrap:{table:"table table-bordered table-striped",caption:"caption",header:"bootstrap-header",footerRow:"",footerCells:"",icons:"",sortNone:"bootstrap-icon-unsorted",sortAsc:"icon-chevron-up glyphicon glyphicon-chevron-up",sortDesc:"icon-chevron-down glyphicon glyphicon-chevron-down",active:"",hover:"",filterRow:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all",caption:"ui-widget-content ui-corner-all",header:"ui-widget-header ui-corner-all ui-state-default", footerRow:"",footerCells:"",icons:"ui-icon",sortNone:"ui-icon-carat-2-n-s",sortAsc:"ui-icon-carat-1-n",sortDesc:"ui-icon-carat-1-s",active:"ui-state-active",hover:"ui-state-hover",filterRow:"",even:"ui-widget-content",odd:"ui-state-default"}};k.extend(c.css,{filterRow:"tablesorter-filter-row",filter:"tablesorter-filter",wrapper:"tablesorter-wrapper",resizer:"tablesorter-resizer",grip:"tablesorter-resizer-grip",sticky:"tablesorter-stickyHeader",stickyVis:"tablesorter-sticky-visible"});
+c.storage=function(b,a,c,d){b=k(b)[0];var f,g,h=!1;f={};g=b.config;var l=k(b);b=d&&d.id||l.attr(d&&d.group||"data-table-group")||b.id||k(".tablesorter").index(l);d=d&&d.url||l.attr(d&&d.page||"data-table-page")||g&&g.fixedUrl||window.location.pathname;if("localStorage"in window)try{window.localStorage.setItem("_tmptest","temp"),h=!0,window.localStorage.removeItem("_tmptest")}catch(n){}k.parseJSON&&(h?f=k.parseJSON(localStorage[a]||"{}"):(g=document.cookie.split(/[;\s|=]/),f=k.inArray(a,g)+1,f=0!==f?k.parseJSON(g[f]|| "{}"):{}));if((c||""===c)&&window.JSON&&JSON.hasOwnProperty("stringify"))f[d]||(f[d]={}),f[d][b]=c,h?localStorage[a]=JSON.stringify(f):(c=new Date,c.setTime(c.getTime()+31536E6),document.cookie=a+"="+JSON.stringify(f).replace(/\"/g,'"')+"; expires="+c.toGMTString()+"; path=/");else return f&&f[d]?f[d][b]:""};
+c.addHeaderResizeEvent=function(b,a,c){var d;c=k.extend({},{timer:250},c);var f=b.config,g=f.widgetOptions,h=function(a){g.resize_flag=!0;d=[];f.$headers.each(function(){var a=k(this),b=a.data("savedSizes")|| [0,0],c=this.offsetWidth,e=this.offsetHeight;if(c!==b[0]||e!==b[1])a.data("savedSizes",[c,e]),d.push(this)});d.length&&!1!==a&&f.$table.trigger("resize",[d]);g.resize_flag=!1};h(!1);clearInterval(g.resize_timer);if(a)return g.resize_flag=!1;g.resize_timer=setInterval(function(){g.resize_flag||h()},c.timer)};
+c.addWidget({id:"uitheme",priority:10,format:function(b,a,e){var d,f,g,h=c.themes;d=a.$table;g=a.$headers;var l=a.theme||"jui",n=h[l]||h.jui,h=n.sortNone+" "+n.sortDesc+" "+n.sortAsc;a.debug&& (f=new Date);d.hasClass("tablesorter-"+l)&&a.theme!==l&&b.hasInitialized||(""!==n.even&&(e.zebra[0]+=" "+n.even),""!==n.odd&&(e.zebra[1]+=" "+n.odd),d.find("caption").addClass(n.caption),b=d.removeClass(""===a.theme?"":"tablesorter-"+a.theme).addClass("tablesorter-"+l+" "+n.table).find("tfoot"),b.length&&b.find("tr").addClass(n.footerRow).children("th, td").addClass(n.footerCells),g.addClass(n.header).not(".sorter-false").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(a){k(this)["mouseenter"=== a.type?"addClass":"removeClass"](n.hover)}),g.find("."+c.css.wrapper).length||g.wrapInner('<div class="'+c.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>'),a.cssIcon&&g.find("."+c.css.icon).addClass(n.icons),d.hasClass("hasFilters")&&g.find("."+c.css.filterRow).addClass(n.filterRow));for(d=0;d<a.columns;d++)b=a.$headers.add(a.$extraHeaders).filter('[data-column="'+d+'"]'),e=c.css.icon?b.find("."+c.css.icon):b,a.$headers.filter('[data-column="'+d+'"]:last')[0].sortDisabled? (b.removeClass(h),e.removeClass(h+" "+n.icons)):(g=b.hasClass(c.css.sortAsc)?n.sortAsc:b.hasClass(c.css.sortDesc)?n.sortDesc:b.hasClass(c.css.header)?n.sortNone:"",b[g===n.sortNone?"removeClass":"addClass"](n.active),e.removeClass(h).addClass(g));a.debug&&c.benchmark("Applying "+l+" theme",f)},remove:function(b,a,e){b=a.$table;a=a.theme||"jui";e=c.themes[a]||c.themes.jui;var d=b.children("thead").children(),f=e.sortNone+" "+e.sortDesc+" "+e.sortAsc;b.removeClass("tablesorter-"+a+" "+e.table).find(c.css.header).removeClass(e.header); d.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(e.hover+" "+f+" "+e.active).find("."+c.css.filterRow).removeClass(e.filterRow);d.find("."+c.css.icon).removeClass(e.icons)}});
+c.addWidget({id:"columns",priority:30,options:{columns:["primary","secondary","tertiary"]},format:function(b,a,e){var d,f,g,h,l,n,p,m,s=a.$table,r=a.$tbodies,t=a.sortList,x=t.length,v=e&&e.columns||["primary","secondary","tertiary"],w=v.length-1;p=v.join(" ");a.debug&&(d=new Date);for(g=0;g<r.length;g++)f=c.processTbody(b, r.eq(g),!0),h=f.children("tr"),h.each(function(){l=k(this);if("none"!==this.style.display&&(n=l.children().removeClass(p),t&&t[0]&&(n.eq(t[0][0]).addClass(v[0]),1<x)))for(m=1;m<x;m++)n.eq(t[m][0]).addClass(v[m]||v[w])}),c.processTbody(b,f,!1);b=!1!==e.columns_thead?["thead tr"]:[];!1!==e.columns_tfoot&&b.push("tfoot tr");if(b.length&&(h=s.find(b.join(",")).children().removeClass(p),x))for(m=0;m<x;m++)h.filter('[data-column="'+t[m][0]+'"]').addClass(v[m]||v[w]);a.debug&&c.benchmark("Applying Columns widget", d)},remove:function(b,a,e){var d=a.$tbodies,f=(e.columns||["primary","secondary","tertiary"]).join(" ");a.$headers.removeClass(f);a.$table.children("tfoot").children("tr").children("th, td").removeClass(f);for(a=0;a<d.length;a++)e=c.processTbody(b,d.eq(a),!0),e.children("tr").each(function(){k(this).children().removeClass(f)}),c.processTbody(b,e,!1)}});
+c.addWidget({id:"filter",priority:50,options:{filter_childRows:!1,filter_columnFilters:!0,filter_cssFilter:"",filter_external:"",filter_filteredRow:"filtered", filter_formatter:null,filter_functions:null,filter_hideEmpty:!0,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_onlyAvail:"filter-onlyAvail",filter_placeholder:{search:"",select:""},filter_reset:null,filter_saveFilters:!1,filter_searchDelay:300,filter_selectSource:null,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_defaultAttrib:"data-value"},format:function(b,a,e){a.$table.hasClass("hasFilters")||c.filter.init(b,a,e)},remove:function(b,a, e){var d,f=a.$tbodies;a.$table.removeClass("hasFilters").unbind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter ")).find("."+c.css.filterRow).remove();for(a=0;a<f.length;a++)d=c.processTbody(b,f.eq(a),!0),d.children().removeClass(e.filter_filteredRow).show(),c.processTbody(b,d,!1);e.filter_reset&&k(document).undelegate(e.filter_reset,"click.tsfilter")}});
+c.filter={regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, child:/tablesorter-childRow/,filtered:/filtered/,type:/undefined|number/,exact:/(^[\"|\'|=]+)|([\"|\'|=]+$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g},types:{regex:function(b,a,e,d){if(c.filter.regex.regex.test(a)){var f;b=c.filter.regex.regex.exec(a);try{f=(new RegExp(b[1],b[2])).test(d)}catch(g){f=!1}return f}return null},operators:function(b,a,e,d,f,g,h,l,n){if(/^[<>]=?/.test(a)){var p;e=h.config;b=c.formatFloat(a.replace(c.filter.regex.operators,""),h);l=e.parsers[g];e=b;if(n[g]||"numeric"=== l.type)p=l.format(k.trim(""+a.replace(c.filter.regex.operators,"")),h,[],g),b="number"!==typeof p||""===p||isNaN(p)?b:p;d=!n[g]&&"numeric"!==l.type||isNaN(b)||"undefined"===typeof f?isNaN(d)?c.formatFloat(d.replace(c.filter.regex.nondigit,""),h):c.formatFloat(d,h):f;/>/.test(a)&&(p=/>=/.test(a)?d>=b:d>b);/</.test(a)&&(p=/<=/.test(a)?d<=b:d<b);p||""!==e||(p=!0);return p}return null},notMatch:function(b,a,e,d,f,g,h,l){if(/^\!/.test(a)){a=a.replace("!","");if(c.filter.regex.exact.test(a))return a=a.replace(c.filter.regex.exact, ""),""===a?!0:k.trim(a)!==d;b=d.search(k.trim(a));return""===a?!0:!(l.filter_startsWith?0===b:0<=b)}return null},exact:function(b,a,e,d,f,g,h,l,n,p){return c.filter.regex.exact.test(a)?(b=a.replace(c.filter.regex.exact,""),p?0<=k.inArray(b,p):b==d):null},and:function(b,a,e,d){if(c.filter.regex.andTest.test(b)){b=a.split(c.filter.regex.andSplit);a=0<=d.search(k.trim(b[0]));for(e=b.length-1;a&&e;)a=a&&0<=d.search(k.trim(b[e])),e--;return a}return null},range:function(b,a,e,d,f,g,h,l,k){if(c.filter.regex.toTest.test(a)){b= h.config;var p=a.split(c.filter.regex.toSplit);e=c.formatFloat(p[0].replace(c.filter.regex.nondigit,""),h);l=c.formatFloat(p[1].replace(c.filter.regex.nondigit,""),h);if(k[g]||"numeric"===b.parsers[g].type)a=b.parsers[g].format(""+p[0],h,b.$headers.eq(g),g),e=""===a||isNaN(a)?e:a,a=b.parsers[g].format(""+p[1],h,b.$headers.eq(g),g),l=""===a||isNaN(a)?l:a;a=!k[g]&&"numeric"!==b.parsers[g].type||isNaN(e)||isNaN(l)?isNaN(d)?c.formatFloat(d.replace(c.filter.regex.nondigit,""),h):c.formatFloat(d,h):f;e> l&&(d=e,e=l,l=d);return a>=e&&a<=l||""===e||""===l}return null},wild:function(b,a,e,d,f,g,h,l,n,p){return/[\?|\*]/.test(a)||c.filter.regex.orReplace.test(b)?(b=h.config,a=a.replace(c.filter.regex.orReplace,"|"),!b.$headers.filter('[data-column="'+g+'"]:last').hasClass("filter-match")&&/\|/.test(a)&&(a=k.isArray(p)?"("+a+")":"^("+a+")$"),(new RegExp(a.replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*"))).test(d)):null},fuzzy:function(b,a,c,d){if(/^~/.test(a)){b=0;c=d.length;var f=a.slice(1);for(a=0;a<c;a++)d[a]=== f[b]&&(b+=1);return b===f.length?!0:!1}return null}},init:function(b,a,e){c.language=k.extend(!0,{},{to:"to",or:"or",and:"and"},c.language);var d,f,g,h,l,n,p;d=c.filter.regex;a.debug&&(n=new Date);a.$table.addClass("hasFilters");k.extend(d,{child:new RegExp(a.cssChildRow),filtered:new RegExp(e.filter_filteredRow),alreadyFiltered:new RegExp("(\\s+("+c.language.or+"|-|"+c.language.to+")\\s+)","i"),toTest:new RegExp("\\s+(-|"+c.language.to+")\\s+","i"),toSplit:new RegExp("(?:\\s+(?:-|"+c.language.to+ ")\\s+)","gi"),andTest:new RegExp("\\s+("+c.language.and+"|&&)\\s+","i"),andSplit:new RegExp("(?:\\s+(?:"+c.language.and+"|&&)\\s+)","gi"),orReplace:new RegExp("\\s+("+c.language.or+")\\s+","gi")});!1!==e.filter_columnFilters&&a.$headers.filter(".filter-false").length!==a.$headers.length&&c.filter.buildRow(b,a,e);a.$table.bind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter "),function(d,g){a.$table.find("."+c.css.filterRow).toggle(!(e.filter_hideEmpty&& k.isEmptyObject(a.cache)));/(search|filter)/.test(d.type)||(d.stopPropagation(),c.filter.buildDefault(b,!0));"filterReset"===d.type?c.filter.searching(b,[]):"filterEnd"===d.type?c.filter.buildDefault(b,!0):(g="search"===d.type?g:"updateComplete"===d.type?a.$table.data("lastSearch"):"",/(update|add)/.test(d.type)&&"updateComplete"!==d.type&&(a.lastCombinedFilter=null,a.lastSearch=[]),c.filter.searching(b,g,!0));return!1});e.filter_reset&&(e.filter_reset instanceof k?e.filter_reset.click(function(){a.$table.trigger("filterReset")}): k(e.filter_reset).length&&k(document).undelegate(e.filter_reset,"click.tsfilter").delegate(e.filter_reset,"click.tsfilter",function(){a.$table.trigger("filterReset")}));if(e.filter_functions)for(h=0;h<a.columns;h++)if(p=c.getColumnData(b,e.filter_functions,h))if(g=a.$headers.filter('[data-column="'+h+'"]:last'),d="",!0===p&&!g.hasClass("filter-false"))c.filter.buildSelect(b,h);else if("object"===typeof p&&!g.hasClass("filter-false")){for(f in p)"string"===typeof f&&(d+=""===d?'<option value="">'+ (g.data("placeholder")||g.attr("data-placeholder")||e.filter_placeholder.select||"")+"</option>":"",d+='<option value="'+f+'">'+f+"</option>");a.$table.find("thead").find("select."+c.css.filter+'[data-column="'+h+'"]').append(d)}c.filter.buildDefault(b,!0);c.filter.bindSearch(b,a.$table.find("."+c.css.filter),!0);e.filter_external&&c.filter.bindSearch(b,e.filter_external);e.filter_hideFilters&&c.filter.hideFilters(b,a);a.showProcessing&&a.$table.bind("filterStart"+a.namespace+"filter filterEnd"+a.namespace+ "filter",function(d,e){g=e?a.$table.find("."+c.css.header).filter("[data-column]").filter(function(){return""!==e[k(this).data("column")]}):"";c.isProcessing(b,"filterStart"===d.type,e?g:"")});a.debug&&c.benchmark("Applying Filter widget",n);a.$table.bind("tablesorter-initialized pagerInitialized",function(){l=c.filter.setDefaults(b,a,e)||[];l.length&&c.setFilters(b,l,!0);a.$table.trigger("filterFomatterUpdate");c.filter.checkFilters(b,l)});e.filter_initialized=!0;a.$table.trigger("filterInit")}, setDefaults:function(b,a,e){var d,f=c.getFilters(b)||[];e.filter_saveFilters&&c.storage&&(d=c.storage(b,"tablesorter-filters")||[],(b=k.isArray(d))&&""===d.join("")||!b||(f=d));if(""===f.join(""))for(b=0;b<a.columns;b++)f[b]=a.$headers.filter('[data-column="'+b+'"]:last').attr(e.filter_defaultAttrib)||f[b];a.$table.data("lastSearch",f);return f},buildRow:function(b,a,e){var d,f,g,h,l=a.columns;g='<tr class="'+c.css.filterRow+'">';for(d=0;d<l;d++)g+="<td></td>";a.$filters=k(g+"</tr>").appendTo(a.$table.children("thead").eq(0)).find("td"); for(d=0;d<l;d++)f=a.$headers.filter('[data-column="'+d+'"]:last'),g=c.getColumnData(b,e.filter_functions,d),g=e.filter_functions&&g&&"function"!==typeof g||f.hasClass("filter-select"),h="false"===c.getData(f[0],c.getColumnData(b,a.headers,d),"filter"),g?g=k("<select>").appendTo(a.$filters.eq(d)):((g=c.getColumnData(b,e.filter_formatter,d))?((g=g(a.$filters.eq(d),d))&&0===g.length&&(g=a.$filters.eq(d).children("input")),g&&(0===g.parent().length||g.parent().length&&g.parent()[0]!==a.$filters[d])&& a.$filters.eq(d).append(g)):g=k('<input type="search">').appendTo(a.$filters.eq(d)),g&&g.attr("placeholder",f.data("placeholder")||f.attr("data-placeholder")||e.filter_placeholder.search||"")),g&&(f=(k.isArray(e.filter_cssFilter)?"undefined"!==typeof e.filter_cssFilter[d]?e.filter_cssFilter[d]||"":"":e.filter_cssFilter)||"",g.addClass(c.css.filter+" "+f).attr("data-column",d),h&&(g.attr("placeholder","").addClass("disabled")[0].disabled=!0))},bindSearch:function(b,a,e){b=k(b)[0];a=k(a);if(a.length){var d= b.config,f=d.widgetOptions,g=f.filter_$externalFilters;!0!==e&&(f.filter_$anyMatch=a.filter('[data-column="all"]'),f.filter_$externalFilters=g&&g.length?f.filter_$externalFilters.add(a):a,c.setFilters(b,d.$table.data("lastSearch")||[],!1===e));a.attr("data-lastSearchTime",(new Date).getTime()).unbind(["keypress","keyup","search","change",""].join(d.namespace+"filter ")).bind(["keyup","search","change",""].join(d.namespace+"filter "),function(a){k(this).attr("data-lastSearchTime",(new Date).getTime()); if(27===a.which)this.value="";else if("number"===typeof f.filter_liveSearch&&this.value.length<f.filter_liveSearch&&""!==this.value||"keyup"===a.type&&(32>a.which&&8!==a.which&&!0===f.filter_liveSearch&&13!==a.which||37<=a.which&&40>=a.which||13!==a.which&&!1===f.filter_liveSearch))return;c.filter.searching(b,"change"!==a.type,!0)}).bind("keypress."+d.namespace+"filter",function(a){13===a.which&&(a.preventDefault(),k(this).blur())});d.$table.bind("filterReset",function(){a.val("")})}},checkFilters:function(b, a,e){var d=b.config,f=d.widgetOptions,g=k.isArray(a),h=g?a:c.getFilters(b,!0),l=(h||[]).join("");if(!k.isEmptyObject(d.cache)&&(g&&c.setFilters(b,h,!1,!0!==e),f.filter_hideFilters&&d.$table.find("."+c.css.filterRow).trigger(""===l?"mouseleave":"mouseenter"),d.lastCombinedFilter!==l||!1===a))if(!1===a&&(d.lastCombinedFilter=null,d.lastSearch=[]),d.$table.trigger("filterStart",[h]),d.showProcessing)setTimeout(function(){c.filter.findRows(b,h,l);return!1},30);else return c.filter.findRows(b,h,l),!1}, hideFilters:function(b,a){var e,d,f;k(b).find("."+c.css.filterRow).addClass("hideme").bind("mouseenter mouseleave",function(b){e=k(this);clearTimeout(f);f=setTimeout(function(){/enter|over/.test(b.type)?e.removeClass("hideme"):k(document.activeElement).closest("tr")[0]!==e[0]&&""===a.lastCombinedFilter&&e.addClass("hideme")},200)}).find("input, select").bind("focus blur",function(b){d=k(this).closest("tr");clearTimeout(f);f=setTimeout(function(){if(""===c.getFilters(a.$table).join(""))d["focus"=== b.type?"removeClass":"addClass"]("hideme")},200)})},findRows:function(b,a,e){if(b.config.lastCombinedFilter!==e){var d,f,g,h,l,n,p,m,s,r,t,x,v,w,z,y,A,B,L,C,G,H,I,J,M,D,E=c.filter.regex,q=b.config,u=q.widgetOptions,N=q.columns,K=q.$table.children("tbody"),O=["range","notMatch","operators"],F=q.$headers.map(function(a){return q.parsers&&q.parsers[a]&&q.parsers[a].parsed||c.getData&&"parsed"===c.getData(q.$headers.filter('[data-column="'+a+'"]:last'),c.getColumnData(b,q.headers,a),"filter")||k(this).hasClass("filter-parsed")}).get(); q.debug&&(L=new Date);for(l=0;l<K.length;l++)if(!K.eq(l).hasClass(q.cssInfoBlock||c.css.info)){n=c.processTbody(b,K.eq(l),!0);m=q.columns;g=k(k.map(q.cache[l].normalized,function(a){return a[m].$row.get()}));if(""===e||u.filter_serversideFiltering)g.removeClass(u.filter_filteredRow).not("."+q.cssChildRow).show();else{g=g.not("."+q.cssChildRow);f=g.length;y=!0;p=q.lastSearch||q.$table.data("lastSearch")||[];for(r=0;r<m;r++)s=a[r]||"",y||(r=m),y=y&&p.length&&0===s.indexOf(p[r]||"")&&!E.alreadyFiltered.test(s)&& !/[=\"\|!]/.test(s)&&!(/(>=?\s*-\d)/.test(s)||/(<=?\s*\d)/.test(s))&&!(""!==s&&q.$filters&&q.$filters.eq(r).find("select").length&&!q.$headers.filter('[data-column="'+r+'"]:last').hasClass("filter-match"));p=g.not("."+u.filter_filteredRow).length;y&&0===p&&(y=!1);q.debug&&c.log("Searching through "+(y&&p<f?p:"all")+" rows");if(u.filter_$anyMatch&&u.filter_$anyMatch.length||a[q.columns])C=u.filter_$anyMatch&&u.filter_$anyMatch.val()||a[q.columns]||"",q.sortLocaleCompare&&(C=c.replaceAccents(C)),G= C.toLowerCase();for(h=0;h<f;h++)if(s=g[h].className,!(E.child.test(s)||y&&E.filtered.test(s))){B=!0;s=g.eq(h).nextUntil("tr:not(."+q.cssChildRow+")");r=s.length&&u.filter_childRows?s.text():"";r=u.filter_ignoreCase?r.toLocaleLowerCase():r;p=g.eq(h).children();C&&(H=p.map(function(a){F[a]?a=q.cache[l].normalized[h][a]:(a=u.filter_ignoreCase?k(this).text().toLowerCase():k(this).text(),q.sortLocaleCompare&&(a=c.replaceAccents(a)));return a}).get(),I=H.join(" "),J=I.toLowerCase(),M=q.cache[l].normalized[h].slice(0, -1).join(" "),A=null,k.each(c.filter.types,function(a,d){if(0>k.inArray(a,O)&&(w=d(C,G,I,J,M,N,b,u,F,H),null!==w))return A=w,!1}),B=null!==A?A:0<=(J+r).indexOf(G));for(m=0;m<N;m++)a[m]&&(d=q.cache[l].normalized[h][m],u.filter_useParsedData||F[m]?t=d:(t=k.trim(p.eq(m).text()),t=q.sortLocaleCompare?c.replaceAccents(t):t),x=!E.type.test(typeof t)&&u.filter_ignoreCase?t.toLocaleLowerCase():t,z=B,a[m]=q.sortLocaleCompare?c.replaceAccents(a[m]):a[m],v=u.filter_ignoreCase?(a[m]||"").toLocaleLowerCase(): a[m],(D=c.getColumnData(b,u.filter_functions,m))?!0===D?z=q.$headers.filter('[data-column="'+m+'"]:last').hasClass("filter-match")?0<=x.search(v):a[m]===t:"function"===typeof D?z=D(t,d,a[m],m,g.eq(h)):"function"===typeof D[a[m]]&&(z=D[a[m]](t,d,a[m],m,g.eq(h))):(A=null,k.each(c.filter.types,function(c,e){w=e(a[m],v,t,x,d,m,b,u,F);if(null!==w)return A=w,!1}),null!==A?z=A:(t=(x+r).indexOf(v),z=!u.filter_startsWith&&0<=t||u.filter_startsWith&&0===t)),B=z?B:!1);g.eq(h).toggle(B).toggleClass(u.filter_filteredRow, !B);s.length&&s.toggleClass(u.filter_filteredRow,!B)}}c.processTbody(b,n,!1)}q.lastCombinedFilter=e;q.lastSearch=a;q.$table.data("lastSearch",a);u.filter_saveFilters&&c.storage&&c.storage(b,"tablesorter-filters",a);q.debug&&c.benchmark("Completed filter widget search",L);q.$table.trigger("filterEnd");setTimeout(function(){q.$table.trigger("applyWidgets")},0)}},getOptionSource:function(b,a,e){var d,f=b.config,g=[],h=!1,l=f.widgetOptions.filter_selectSource,n=k.isFunction(l)?!0:c.getColumnData(b,l, a);!0===n?h=l(b,a,e):"object"===k.type(l)&&n&&(h=n(b,a,e));!1===h&&(h=c.filter.getOptions(b,a,e));h=k.grep(h,function(a,b){return k.inArray(a,h)===b});f.$headers.filter('[data-column="'+a+'"]:last').hasClass("filter-select-nosort")||(k.each(h,function(d,c){g.push({t:c,p:f.parsers&&f.parsers[a].format(c,b,[],a)||c})}),d=f.textSorter||"",g.sort(function(e,g){var f=e.p.toString(),h=g.p.toString();return k.isFunction(d)?d(f,h,!0,a,b):"object"===typeof d&&d.hasOwnProperty(a)?d[a](f,h,!0,a,b):c.sortNatural? c.sortNatural(f,h):!0}),h=[],k.each(g,function(a,b){h.push(b.t)}));return h},getOptions:function(b,a,c){var d,f,g,h,l=b.config,n=l.widgetOptions,p=l.$table.children("tbody"),m=[];for(d=0;d<p.length;d++)if(!p.eq(d).hasClass(l.cssInfoBlock))for(h=l.cache[d],f=l.cache[d].normalized.length,b=0;b<f;b++)g=h.row?h.row[b]:h.normalized[b][l.columns].$row[0],c&&g.className.match(n.filter_filteredRow)||(n.filter_useParsedData?m.push(""+h.normalized[b][a]):(g=g.cells[a])&&m.push(k.trim(g.textContent||g.innerText|| k(g).text())));return m},buildSelect:function(b,a,e,d){if(b.config.cache&&!k.isEmptyObject(b.config.cache)){a=parseInt(a,10);var f;f=b.config;var g=f.widgetOptions,h=f.$headers.filter('[data-column="'+a+'"]:last'),h='<option value="">'+(h.data("placeholder")||h.attr("data-placeholder")||g.filter_placeholder.select||"")+"</option>",l=c.filter.getOptionSource(b,a,d),n=f.$table.find("thead").find("select."+c.css.filter+'[data-column="'+a+'"]').val();for(b=0;b<l.length;b++)d=l[b].replace(/\"/g,"&quot;"), h+=""!==l[b]?'<option value="'+d+'"'+(n===d?' selected="selected"':"")+">"+l[b]+"</option>":"";f=(f.$filters?f.$filters:f.$table.children("thead")).find("."+c.css.filter);g.filter_$externalFilters&&(f=f&&f.length?f.add(g.filter_$externalFilters):g.filter_$externalFilters);f.filter('select[data-column="'+a+'"]')[e?"html":"append"](h);g.filter_functions||(g.filter_functions={});g.filter_functions[a]=!0}},buildDefault:function(b,a){var e,d,f=b.config,g=f.widgetOptions,h=f.columns;for(e=0;e<h;e++)d=f.$headers.filter('[data-column="'+ e+'"]:last'),!d.hasClass("filter-select")&&!0!==c.getColumnData(b,g.filter_functions,e)||d.hasClass("filter-false")||c.filter.buildSelect(b,e,a,d.hasClass(g.filter_onlyAvail))},searching:function(b,a,e){if("undefined"===typeof a||!0===a){var d=b.config.widgetOptions;clearTimeout(d.searchTimer);d.searchTimer=setTimeout(function(){c.filter.checkFilters(b,a,e)},d.filter_liveSearch?d.filter_searchDelay:10)}else c.filter.checkFilters(b,a,e)}};
+c.getFilters=function(b,a,e,d){var f,g=!1,h=b?k(b)[0].config: "",l=h?h.widgetOptions:"";if(!0!==a&&l&&!l.filter_columnFilters)return k(b).data("lastSearch");if(h&&(h.$filters&&(f=h.$filters.find("."+c.css.filter)),l.filter_$externalFilters&&(f=f&&f.length?f.add(l.filter_$externalFilters):l.filter_$externalFilters),f&&f.length))for(g=e||[],b=0;b<h.columns+1;b++)a=f.filter('[data-column="'+(b===h.columns?"all":b)+'"]'),a.length&&(a=a.sort(function(a,b){return k(b).attr("data-lastSearchTime")-k(a).attr("data-lastSearchTime")}),k.isArray(e)?(d?a.slice(1):a).val(e[b]).trigger("change.tsfilter"): (g[b]=a.val()||"",a.slice(1).val(g[b])),b===h.columns&&a.length&&(l.filter_$anyMatch=a));0===g.length&&(g=!1);return g};
+c.setFilters=function(b,a,e,d){var f=b?k(b)[0].config:"";b=c.getFilters(b,!0,a,d);f&&e&&(f.lastCombinedFilter=null,f.lastSearch=[],c.filter.searching(f.$table[0],a,d),f.$table.trigger("filterFomatterUpdate"));return!!b};
+c.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"",stickyHeaders_attachTo:null,stickyHeaders_offset:0,stickyHeaders_filteredToTop:!0,stickyHeaders_cloneId:"-sticky", stickyHeaders_addResizeEvent:!0,stickyHeaders_includeCaption:!0,stickyHeaders_zIndex:2},format:function(b,a,e){if(!(a.$table.hasClass("hasStickyHeaders")||0<=k.inArray("filter",a.widgets)&&!a.$table.hasClass("hasFilters"))){var d=a.$table,f=k(e.stickyHeaders_attachTo),g=d.children("thead:first"),h=f.length?f:k(window),l=g.children("tr").not(".sticky-false").children(),n="."+c.css.headerIn,p=d.find("tfoot"),m=isNaN(e.stickyHeaders_offset)?k(e.stickyHeaders_offset):"",s=f.length?0:m.length?m.height()|| 0:parseInt(e.stickyHeaders_offset,10)||0,r=e.$sticky=d.clone().addClass("containsStickyHeaders").css({position:f.length?"absolute":"fixed",margin:0,top:s,left:0,visibility:"hidden",zIndex:e.stickyHeaders_zIndex?e.stickyHeaders_zIndex:2}),t=r.children("thead:first").addClass(c.css.sticky+" "+e.stickyHeaders),x,v="",w=0,z="collapse"!==d.css("border-collapse")&&!/(webkit|msie)/i.test(navigator.userAgent),y=function(){s=m.length?m.height()||0:parseInt(e.stickyHeaders_offset,10)||0;w=0;z&&(w=2*parseInt(l.eq(0).css("border-left-width"), 10));r.css({left:f.length?(parseInt(f.css("padding-left"),10)||0)+parseInt(a.$table.css("padding-left"),10)+parseInt(a.$table.css("margin-left"),10)+parseInt(d.css("border-left-width"),10):g.offset().left-h.scrollLeft()-w,width:d.width()});x.filter(":visible").each(function(b){b=l.filter(":visible").eq(b);var d=z&&k(this).attr("data-column")===""+parseInt(a.columns/2,10)?1:0;k(this).css({width:b.width()-w}).find(n).width(b.find(n).width()-d)})};r.attr("id")&&(r[0].id+=e.stickyHeaders_cloneId);r.find("thead:gt(0), tr.sticky-false").hide(); r.find("tbody, tfoot").remove();e.stickyHeaders_includeCaption?r.find("caption").css("margin-left","-1px"):r.find("caption").remove();x=t.children().children();r.css({height:0,width:0,padding:0,margin:0,border:0});x.find("."+c.css.resizer).remove();d.addClass("hasStickyHeaders").bind("pagerComplete.tsSticky",function(){y()});c.bindEvents(b,t.children().children(".tablesorter-header"));d.after(r);h.bind("scroll.tsSticky resize.tsSticky",function(a){if(d.is(":visible")){var b=d.offset(),c=e.stickyHeaders_includeCaption? 0:d.find("caption").outerHeight(!0),c=(f.length?f.offset().top:h.scrollTop())+s-c,k=d.height()-(r.height()+(p.height()||0)),b=c>b.top&&c<b.top+k?"visible":"hidden",c={visibility:b};f.length?c.top=f.scrollTop():c.left=g.offset().left-h.scrollLeft()-w;r.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+b).css(c);if(b!==v||"resize"===a.type)y(),v=b}});e.stickyHeaders_addResizeEvent&&c.addHeaderResizeEvent(b);d.hasClass("hasFilters")&&(d.bind("filterEnd", function(){var b=k(document.activeElement).closest("td"),b=b.parent().children().index(b);r.hasClass(c.css.stickyVis)&&e.stickyHeaders_filteredToTop&&(window.scrollTo(0,d.position().top),0<=b&&a.$filters&&a.$filters.eq(b).find("a, select, input").filter(":visible").focus())}),c.filter.bindSearch(d,x.find("."+c.css.filter)),e.filter_hideFilters&&c.filter.hideFilters(r,a));d.trigger("stickyHeadersInit")}},remove:function(b,a,e){a.$table.removeClass("hasStickyHeaders").unbind("pagerComplete.tsSticky").find("."+ c.css.sticky).remove();e.$sticky&&e.$sticky.length&&e.$sticky.remove();k(".hasStickyHeaders").length||k(window).unbind("scroll.tsSticky resize.tsSticky");c.addHeaderResizeEvent(b,!1)}});
+c.addWidget({id:"resizable",priority:40,options:{resizable:!0,resizable_addLastColumn:!1,resizable_widths:[]},format:function(b,a,e){if(!a.$table.hasClass("hasResizable")){a.$table.addClass("hasResizable");c.resizableReset(b,!0);var d,f,g,h,l={},n=a.$table,p=0,m=null,s=null,r=20>Math.abs(n.parent().width()-n.width()), t=function(){c.storage&&m&&s&&(l={},l[m.index()]=m.width(),l[s.index()]=s.width(),m.width(l[m.index()]),s.width(l[s.index()]),!1!==e.resizable&&c.storage(b,"tablesorter-resizable",a.$headers.map(function(){return k(this).width()}).get()));p=0;m=s=null;k(window).trigger("resize")};if(l=c.storage&&!1!==e.resizable?c.storage(b,"tablesorter-resizable"):{})for(h in l)!isNaN(h)&&h<a.$headers.length&&a.$headers.eq(h).width(l[h]);d=n.children("thead:first").children("tr");d.children().each(function(){var e; e=k(this);h=e.attr("data-column");e="false"===c.getData(e,c.getColumnData(b,a.headers,h),"resizable");d.children().filter('[data-column="'+h+'"]')[e?"addClass":"removeClass"]("resizable-false")});d.each(function(){g=k(this).children().not(".resizable-false");k(this).find("."+c.css.wrapper).length||g.wrapInner('<div class="'+c.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>');e.resizable_addLastColumn||(g=g.slice(0,-1));f=f?f.add(g):g});f.each(function(){var a=k(this),b=parseInt(a.css("padding-right"), 10)+10;a.find("."+c.css.wrapper).append('<div class="'+c.css.resizer+'" style="cursor:w-resize;position:absolute;z-index:1;right:-'+b+'px;top:0;height:100%;width:20px;"></div>')}).bind("mousemove.tsresize",function(a){if(0!==p&&m){var b=a.pageX-p,c=m.width();m.width(c+b);m.width()!==c&&r&&s.width(s.width()-b);p=a.pageX}}).bind("mouseup.tsresize",function(){t()}).find("."+c.css.resizer+",."+c.css.grip).bind("mousedown",function(b){m=k(b.target).closest("th");var c=a.$headers.filter('[data-column="'+ m.attr("data-column")+'"]');1<c.length&&(m=m.add(c));s=b.shiftKey?m.parent().find("th").not(".resizable-false").filter(":last"):m.nextAll(":not(.resizable-false)").eq(0);p=b.pageX});n.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize",function(){t()}).bind("contextmenu.tsresize",function(){c.resizableReset(b);var a=k.isEmptyObject?k.isEmptyObject(l):!0;l={};return a})}},remove:function(b,a){a.$table.removeClass("hasResizable").children("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").children("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find("."+ c.css.resizer+",."+c.css.grip).remove();c.resizableReset(b)}});
+c.resizableReset=function(b,a){k(b).each(function(){var e,d=this.config,f=d&&d.widgetOptions;b&&d&&(d.$headers.each(function(a){e=k(this);f.resizable_widths[a]?e.css("width",f.resizable_widths[a]):e.hasClass("resizable-false")||e.css("width","")}),c.storage&&!a&&c.storage(this,"tablesorter-resizable",{}))})};
+c.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(b,a,c,d){a.format(b,c,d,!0)},format:function(b,a,e,d){var f, g=a.$table;e=!1!==e.saveSort;var h={sortList:a.sortList};a.debug&&(f=new Date);g.hasClass("hasSaveSort")?e&&b.hasInitialized&&c.storage&&(c.storage(b,"tablesorter-savesort",h),a.debug&&c.benchmark("saveSort widget: Saving last sort: "+a.sortList,f)):(g.addClass("hasSaveSort"),h="",c.storage&&(h=(e=c.storage(b,"tablesorter-savesort"))&&e.hasOwnProperty("sortList")&&k.isArray(e.sortList)?e.sortList:"",a.debug&&c.benchmark('saveSort: Last sort loaded: "'+h+'"',f),g.bind("saveSortReset",function(a){a.stopPropagation(); c.storage(b,"tablesorter-savesort","")})),d&&h&&0<h.length?a.sortList=h:b.hasInitialized&&h&&0<h.length&&g.trigger("sorton",[h]))},remove:function(b){c.storage&&c.storage(b,"tablesorter-savesort","")}})
+})(jQuery);
diff --git a/kcov-38/data/js/kcov.js b/kcov-38/data/js/kcov.js
new file mode 100644
index 000000000000..73b5e36d1f0b
--- /dev/null
+++ b/kcov-38/data/js/kcov.js
@@ -0,0 +1,78 @@
+window.onload = function () {
+
+	// http://stackoverflow.com/questions/8853396/logical-operator-in-a-handlebars-js-if-conditional
+	Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
+		switch (operator) {
+		case '==':
+			return (v1 == v2) ? options.fn(this) : options.inverse(this);
+		case '===':
+			return (v1 === v2) ? options.fn(this) : options.inverse(this);
+		case '<':
+			return (v1 < v2) ? options.fn(this) : options.inverse(this);
+		case '<=':
+			return (v1 <= v2) ? options.fn(this) : options.inverse(this);
+		case '>':
+			return (v1 > v2) ? options.fn(this) : options.inverse(this);
+		case '>=':
+			return (v1 >= v2) ? options.fn(this) : options.inverse(this);
+		case '&&':
+			return (v1 && v2) ? options.fn(this) : options.inverse(this);
+		case '||':
+			return (v1 || v2) ? options.fn(this) : options.inverse(this);
+		default:
+			return options.inverse(this);
+		}
+	});
+
+	// http://stackoverflow.com/questions/17095813/handlebars-if-and-numeric-zeroes
+	Handlebars.registerHelper('exists', function(variable, options) {
+	    if (typeof variable !== 'undefined') {
+	        return options.fn(this);
+	    } else {
+	        return options.inverse(this);
+	    }
+	});
+
+	var filesElement = document.getElementById("files-template")
+	if (filesElement) {
+		var source   = filesElement.innerHTML;
+		var template = Handlebars.compile(source);
+
+		document.getElementById('files-placeholder').innerHTML = template(data);
+	}
+	var linesElement = document.getElementById("lines-template")
+	if (linesElement) {
+		var source   = linesElement.innerHTML;
+		var template = Handlebars.compile(source);
+		document.getElementById('lines-placeholder').innerHTML = template(data);
+	}
+
+	elem = document.getElementById('header-percent-covered')
+
+	elem.className = toCoverPercentString(header.covered, header.instrumented);
+	elem.innerHTML = ((header.covered / header.instrumented) * 100).toFixed(1) + "%";	    
+
+	document.getElementById('header-command').innerHTML = header.command;
+	document.getElementById('window-title').innerHTML = "Coverage report - " + header.command;
+	document.getElementById('header-date').innerHTML = header.date;
+	document.getElementById('header-covered').innerHTML = header.covered
+	document.getElementById('header-instrumented').innerHTML = header.instrumented
+
+	$("#index-table").tablesorter({
+		theme : 'blue',
+		sortList : [[1,0]],
+		cssInfoBlock : "tablesorter-no-sort",
+		widgets: ["saveSort"],
+	});
+}
+
+function toCoverPercentString (covered, instrumented) {
+	perc = (covered / instrumented) * 100;
+
+	if (perc <= percent_low)
+		return "coverPerLeftLo";
+	else if (perc >= percent_high)
+		return "coverPerLeftHi";
+
+	return "coverPerLeftMed";
+}
diff --git a/kcov-38/data/source-file.html b/kcov-38/data/source-file.html
new file mode 100644
index 000000000000..bec158ded4cb
--- /dev/null
+++ b/kcov-38/data/source-file.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta charset="utf-8">
+  <title id="window-title">???</title>
+  <link rel="stylesheet" type="text/css" href="../data/bcov.css"/>
+</head>
+<script type="text/javascript" src="data/js/jquery.min.js"></script>
+<script type="text/javascript" src="data/js/handlebars.js"></script>
+<script type="text/javascript" src="data/js/kcov.js"></script>
+
+<body>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+  <tr><td class="title">Coverage Report</td></tr>
+  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
+  <tr>
+    <td width="100%">
+      <table cellpadding="1" border="0" width="100%">
+        <tr id="command">
+          <td class="headerItem" width="20%">Command:</td>
+          <td id="header-command" class="headerValue" width="60%" colspan=4>???</td>
+          <td><span class="lineNumLegend">Line number</span></td>
+        </tr>
+        <tr>
+          <td class="headerItem" width="20%">Date: </td>
+          <td id="header-date" class="headerValue" width="20%" colspan=2></td>
+          <td class="headerItem" width="20%">Instrumented lines:</td>
+          <td id="header-instrumented" class="headerValue" width="20%">???</td>
+          <td><span class="coverHitsLegend">Hits</span></td>
+        </tr>
+        <tr>
+          <td class="headerItem" width="20%">Code covered:</td>
+          <td id="header-percent-covered" width="20%" colspan=2>???</td>
+          <td class="headerItem" width="20%">Executed lines:</td>
+          <td id="header-covered" class="headerValue" width="20%">???</td>
+          <td><span class="orderNumLegend">Order</span></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
+</table>
+
+<script id="lines-template" type="text/x-handlebars-template">
+<pre class="source" id="main-data">
+{{#each lines}}
+{{#ifCond possible_hits "==" "0"}}
+<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">{{hits}} </span><span class="{{class}}"> {{line}}</span></span><span class="orderNum"> {{order}}</span></source-line>
+{{else}}
+ {{#exists possible_hits}}
+<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">{{hits}} / {{possible_hits}}</span><span class="{{class}}"> {{line}}</span><span class="orderNum"> {{order}}</span></source-line>
+ {{else}}
+   {{#exists class}}
+<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">&nbsp;</span><span class="{{class}}"> {{line}}</span></span><span class="orderNum">&nbsp;</span></source-line>
+   {{else}}
+<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">&nbsp;</span><span class="{{class}}"> {{line}}</span><span class="orderNum">&nbsp;</span></source-line>
+   {{/exists}}
+ {{/exists}}
+{{/ifCond}}
+{{/each}}
+</pre>
+</script>
+<div id="lines-placeholder"></div>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0" id="merged-data">
+  <tr><td class="ruler"><img src="data/amber.png" width="3" height="3" alt=""/></td></tr>
+  <tr><td class="versionInfo">Generated by: <a href="http://simonkagstrom.github.com/kcov/index.html">Kcov</a></td></tr>
+</table>
+</body>
+</html>
diff --git a/kcov-38/data/tablesorter-theme.css b/kcov-38/data/tablesorter-theme.css
new file mode 100644
index 000000000000..74e9ef202ef8
--- /dev/null
+++ b/kcov-38/data/tablesorter-theme.css
@@ -0,0 +1,221 @@
+/*************
+  Blue Theme
+ *************/
+/* overall */
+.tablesorter-blue {
+	width: 100%;
+	background-color: #fff;
+	margin: 10px 0 15px;
+	text-align: left;
+	border-spacing: 0;
+	border: #cdcdcd 1px solid;
+	border-width: 1px 0 0 1px;
+}
+.tablesorter-blue th,
+.tablesorter-blue td {
+	border: #cdcdcd 1px solid;
+	border-width: 0 1px 1px 0;
+}
+
+/* header */
+.tablesorter-blue th,
+.tablesorter-blue thead td {
+	font: bold 12px/18px Arial, Sans-serif;
+	color: #000;
+	background-color: #99bfe6;
+	border-collapse: collapse;
+	padding: 4px;
+	text-shadow: 0 1px 0 rgba(204, 204, 204, 0.7);
+}
+.tablesorter-blue tbody td,
+.tablesorter-blue tfoot th,
+.tablesorter-blue tfoot td {
+	padding: 4px;
+	vertical-align: top;
+}
+.tablesorter-blue .header,
+.tablesorter-blue .tablesorter-header {
+	/* black (unsorted) double arrow */
+	background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);
+	/* white (unsorted) double arrow */
+	/* background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); */
+	/* image */
+	/* background-image: url(images/black-unsorted.gif); */
+	background-repeat: no-repeat;
+	background-position: center right;
+	padding: 4px 18px 4px 4px;
+	white-space: normal;
+	cursor: pointer;
+}
+.tablesorter-blue .headerSortUp,
+.tablesorter-blue .tablesorter-headerSortUp,
+.tablesorter-blue .tablesorter-headerAsc {
+	background-color: #9fbfdf;
+	/* black asc arrow */
+	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
+	/* white asc arrow */
+	/* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); */
+	/* image */
+	/* background-image: url(images/black-asc.gif); */
+}
+.tablesorter-blue .headerSortDown,
+.tablesorter-blue .tablesorter-headerSortDown,
+.tablesorter-blue .tablesorter-headerDesc {
+	background-color: #8cb3d9;
+	/* black desc arrow */
+	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
+	/* white desc arrow */
+	/* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); */
+	/* image */
+	/* background-image: url(images/black-desc.gif); */
+}
+.tablesorter-blue thead .sorter-false {
+	background-image: none;
+	cursor: default;
+	padding: 4px;
+}
+
+/* tfoot */
+.tablesorter-blue tfoot .tablesorter-headerSortUp,
+.tablesorter-blue tfoot .tablesorter-headerSortDown,
+.tablesorter-blue tfoot .tablesorter-headerAsc,
+.tablesorter-blue tfoot .tablesorter-headerDesc {
+	/* remove sort arrows from footer */
+	background-image: none;
+}
+
+/* tbody */
+.tablesorter-blue td {
+	color: #3d3d3d;
+	background-color: #fff;
+	padding: 4px;
+	vertical-align: top;
+}
+
+/* hovered row colors
+ you'll need to add additional lines for
+ rows with more than 2 child rows
+ */
+.tablesorter-blue tbody > tr:hover > td,
+.tablesorter-blue tbody > tr:hover + tr.tablesorter-childRow > td,
+.tablesorter-blue tbody > tr:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td,
+.tablesorter-blue tbody > tr.even:hover > td,
+.tablesorter-blue tbody > tr.even:hover + tr.tablesorter-childRow > td,
+.tablesorter-blue tbody > tr.even:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
+	background: #d9d9d9;
+}
+.tablesorter-blue tbody > tr.odd:hover > td,
+.tablesorter-blue tbody > tr.odd:hover + tr.tablesorter-childRow > td,
+.tablesorter-blue tbody > tr.odd:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
+	background: #bfbfbf;
+}
+
+/* table processing indicator */
+.tablesorter-blue .tablesorter-processing {
+	background-position: center center !important;
+	background-repeat: no-repeat !important;
+	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
+}
+
+/* Zebra Widget - row alternating colors */
+.tablesorter-blue tbody tr.odd td {
+	background-color: #ebf2fa;
+}
+.tablesorter-blue tbody tr.even td {
+	background-color: #fff;
+}
+
+/* Column Widget - column sort colors */
+.tablesorter-blue td.primary,
+.tablesorter-blue tr.odd td.primary {
+	background-color: #99b3e6;
+}
+.tablesorter-blue tr.even td.primary {
+	background-color: #c2d1f0;
+}
+.tablesorter-blue td.secondary,
+.tablesorter-blue tr.odd td.secondary {
+	background-color: #c2d1f0;
+}
+.tablesorter-blue tr.even td.secondary {
+	background-color: #d6e0f5;
+}
+.tablesorter-blue td.tertiary,
+.tablesorter-blue tr.odd td.tertiary {
+	background-color: #d6e0f5;
+}
+.tablesorter-blue tr.even td.tertiary {
+	background-color: #ebf0fa;
+}
+
+/* caption */
+caption {
+	background: #fff;
+}
+
+/* filter widget */
+.tablesorter-blue .tablesorter-filter-row td {
+	background: #eee;
+	line-height: normal;
+	text-align: center; /* center the input */
+	-webkit-transition: line-height 0.1s ease;
+	-moz-transition: line-height 0.1s ease;
+	-o-transition: line-height 0.1s ease;
+	transition: line-height 0.1s ease;
+}
+/* optional disabled input styling */
+.tablesorter-blue .tablesorter-filter-row .disabled {
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	cursor: not-allowed;
+}
+/* hidden filter row */
+.tablesorter-blue .tablesorter-filter-row.hideme td {
+	/*** *********************************************** ***/
+	/*** change this padding to modify the thickness     ***/
+	/*** of the closed filter row (height = padding x 2) ***/
+	padding: 2px;
+	/*** *********************************************** ***/
+	margin: 0;
+	line-height: 0;
+	cursor: pointer;
+}
+.tablesorter-blue .tablesorter-filter-row.hideme .tablesorter-filter {
+	height: 1px;
+	min-height: 0;
+	border: 0;
+	padding: 0;
+	margin: 0;
+	/* don't use visibility: hidden because it disables tabbing */
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* filters */
+.tablesorter-blue .tablesorter-filter {
+	width: 98%;
+	height: auto;
+	margin: 0;
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #bbb;
+	color: #333;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: height 0.1s ease;
+	-moz-transition: height 0.1s ease;
+	-o-transition: height 0.1s ease;
+	transition: height 0.1s ease;
+}
+/* rows hidden by filtering (needed for child rows) */
+.tablesorter .filtered {
+	display: none;
+}
+
+/* ajax error row */
+.tablesorter .tablesorter-errorRow td {
+	text-align: center;
+	cursor: pointer;
+	background-color: #e6bf99;
+}
diff --git a/kcov-38/debian/.gitignore b/kcov-38/debian/.gitignore
new file mode 100644
index 000000000000..9c1b1314340f
--- /dev/null
+++ b/kcov-38/debian/.gitignore
@@ -0,0 +1,3 @@
+debhelper-build-stamp
+files
+kcov.substvars
diff --git a/kcov-38/debian/README b/kcov-38/debian/README
new file mode 100644
index 000000000000..79d1dd3cf5ab
--- /dev/null
+++ b/kcov-38/debian/README
@@ -0,0 +1,6 @@
+The Debian Package kcov
+----------------------------
+
+Comments regarding the Package
+
+ -- Paul Dreik <github@pauldreik.se>  Fri, 21 Sep 2018 12:39:22 +0200
diff --git a/kcov-38/debian/changelog b/kcov-38/debian/changelog
new file mode 100644
index 000000000000..676ea0bdd78a
--- /dev/null
+++ b/kcov-38/debian/changelog
@@ -0,0 +1,5 @@
+kcov (36) unstable; urgency=medium
+
+  * Initial Release.
+
+ -- Paul Dreik <github@pauldreik.se>  Fri, 21 Sep 2018 12:39:22 +0200
diff --git a/kcov-38/debian/compat b/kcov-38/debian/compat
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/kcov-38/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/kcov-38/debian/control b/kcov-38/debian/control
new file mode 100644
index 000000000000..4a01b1f91bb4
--- /dev/null
+++ b/kcov-38/debian/control
@@ -0,0 +1,19 @@
+Source: kcov
+Section: unknown
+Priority: optional
+Maintainer: Paul Dreik <github@pauldreik.se>
+Build-Depends: debhelper (>= 10), cmake, binutils-dev,  libcurl4-openssl-dev, zlib1g-dev,  libdw-dev, libiberty-dev 
+Standards-Version: 4.1.2
+Homepage: https://github.com/SimonKagstrom/kcov
+#Vcs-Git: https://anonscm.debian.org/git/collab-maint/kcov.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/kcov.git
+
+Package: kcov
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: tool for generating and viewing code coverage
+ kcov is a tool for generating coverage from a binary.
+ The binary needs to be built with debug information.
+ The output is by default html, which can be interactively
+ explored with a web browser.
+
diff --git a/kcov-38/debian/copyright b/kcov-38/debian/copyright
new file mode 100644
index 000000000000..33e49d6130cb
--- /dev/null
+++ b/kcov-38/debian/copyright
@@ -0,0 +1,34 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kcov
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2018 Paul Dreik <github@pauldreik.se>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ 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 package 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 <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/kcov-38/debian/kcov-docs.docs b/kcov-38/debian/kcov-docs.docs
new file mode 100644
index 000000000000..3609b989a6d9
--- /dev/null
+++ b/kcov-38/debian/kcov-docs.docs
@@ -0,0 +1,3 @@
+README.Debian
+README.source
+README
diff --git a/kcov-38/debian/rules b/kcov-38/debian/rules
new file mode 100755
index 000000000000..e1c367c12388
--- /dev/null
+++ b/kcov-38/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
diff --git a/kcov-38/debian/source/format b/kcov-38/debian/source/format
new file mode 100644
index 000000000000..89ae9db8f88b
--- /dev/null
+++ b/kcov-38/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/kcov-38/doc/CMakeLists.txt b/kcov-38/doc/CMakeLists.txt
new file mode 100644
index 000000000000..af6a8316ccf9
--- /dev/null
+++ b/kcov-38/doc/CMakeLists.txt
@@ -0,0 +1 @@
+install (FILES kcov.1 DESTINATION "${KCOV_INSTALL_MANDIR}/man1" )
diff --git a/kcov-38/doc/codecov.md b/kcov-38/doc/codecov.md
new file mode 100644
index 000000000000..75e068e56375
--- /dev/null
+++ b/kcov-38/doc/codecov.md
@@ -0,0 +1,17 @@
+Travis-ci / codecov integration
+---------------------------------
+Integrating with [codecov](http://codecov.io) is easy to do. To upload data from the travis build to codecov, run kcov normally, and then upload using the codecov uploader
+
+```
+kcov /path/to/outdir executable
+bash <(curl -s https://codecov.io/bash) -s /path/to/outdir
+```
+
+The easiest way to achieve this is to run the codecov uploader on travis success:
+
+```
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -s /path/to/outdir
+```
+
+the -s /path/to/outdir part can be skipped if kcov produces output in the current directory.
diff --git a/kcov-38/doc/coveralls.md b/kcov-38/doc/coveralls.md
new file mode 100644
index 000000000000..3849171ecd33
--- /dev/null
+++ b/kcov-38/doc/coveralls.md
@@ -0,0 +1,11 @@
+Travis-ci / coveralls integration
+---------------------------------
+kcov is easy to integrate with [travis-ci](http://travis-ci.org) and
+[coveralls.io](http://coveralls.io). To upload data from the travis build to coveralls,
+run kcov with
+
+```
+kcov --coveralls-id=$TRAVIS_JOB_ID /path/to/outdir executable
+```
+
+which in addition to regular coverage collection uploads to coveralls.
diff --git a/kcov-38/doc/design.txt b/kcov-38/doc/design.txt
new file mode 100644
index 000000000000..1e4a1dd8c223
--- /dev/null
+++ b/kcov-38/doc/design.txt
@@ -0,0 +1,78 @@
+Classes
+=======
+The kcov design is based on a number of classes:
+
+FileParser
+----------
+Reads the binary to parse debugging information, i.e., file/line -> address
+mappings, and reports these to listeners. For ELF binaries, this is done on
+startup, Python and Bash report during runtime.
+
+Collector
+---------
+Controls execution, setup breakpoints, catch signals etc, and report breakpoint
+hits. 
+
+Engine
+------
+Low-level control of execution (i.e., setup breakpoints, start/stop execution).
+
+Reporter
+--------
+Reports breakpoint hits and can be queried for address -> file/line mappings.
+Also reads back accumulated data from previous runs.
+
+OutputHandler
+-------------
+Receives files from the parser and allows writers to register. Will call into
+writers at regular intervals.
+
+Writer
+------
+Queries the reporter to produce HTML and cobertura (currently) output with
+coverage data.
+
+
+Python/bash
+===========
+The above classes are mainly modelled for dwarf/ptrace-based applications.
+When covering python/bash code, the FileParser and Engine interfaces are
+implemented by the same class since coverage data is collected during runtime.
+
+Merge parser
+============
+
+@startuml
+interface FileParser
+interface Engine
+interface Writer
+
+class Configuration
+class Collector
+class Reporter
+class Filter
+
+PtraceEngine -up-|> Engine
+BashEngine -up-|> Engine
+PythonEngine -up-|> Engine
+LLDBEngine -up-|> Engine
+
+BashEngine -down-|> FileParser
+PythonEngine -down-|> FileParser
+LLDBEngine -down-|> FileParser
+
+ElfParser -up-|> FileParser
+
+HTMLWriter -down-|> Writer
+CoberturaWriter -down-|> Writer
+JSONWriter -down-|> Writer
+CoverallsWriter -down-|> Writer
+SonarQubeWriter -down-|> Writer
+
+Collector -- Engine : Sets/collects breakpoints
+Collector -- FileParser : Receives file/line/address
+Collector -- Reporter : Recieves executed lines
+
+Reporter -- Writer : Reports executed lines
+
+@enduml
\ No newline at end of file
diff --git a/kcov-38/doc/full-system-instrumentation.md b/kcov-38/doc/full-system-instrumentation.md
new file mode 100644
index 000000000000..1287890d859f
--- /dev/null
+++ b/kcov-38/doc/full-system-instrumentation.md
@@ -0,0 +1,35 @@
+## *Full system instrumentation with kcov*
+Prerequisites
+-------------
+You need to install patchelf >= 0.9 on your system before recording. Patchelf can be found
+on https://github.com/NixOS/patchelf, or as a package on some distributions (note the version
+though!).
+
+
+Add the kcov-system-daemon to your target system
+------------------------------------------------
+You need to add kcov-system-daemon to your target system and start it early during system
+bootup. This is needed in order to process instrumentation points and write report data.
+
+Instrumenting binaries for a target system
+------------------------------------------
+If your binaries (with debug symbols) are in e.g., sysroot, you can instrument binaries using
+
+```
+kcov-system --system-record /tmp/out-sysroot sysroot
+```
+
+After this finishes, build your filesystem (squashfs etc) using the instrumented binaries
+and install and run on your target.
+
+Note that ```--system-record``` also produces a shared library (libkcov_system_lib) which
+needs to be available in the library on the target system. kcov places it in ```/lib``` under
+```/tmp/out-sysroot```.
+
+Creating a report from the collected data
+-----------------------------------------
+Copy `/tmp/kcov-data` from your target system and run
+
+```
+kcov-system --system-report /tmp/kcov /tmp/kcov-data
+```
diff --git a/kcov-38/doc/gitlab.md b/kcov-38/doc/gitlab.md
new file mode 100644
index 000000000000..4291ae81e076
--- /dev/null
+++ b/kcov-38/doc/gitlab.md
@@ -0,0 +1,8 @@
+GitLab CI integration
+---------------------
+Kcov generates a very generic json file which includes the overall percent covered
+for a single command and the count of lines instrumented and covered. It also includes
+a summary of each source file with a percentage and line counts. This allows easy
+integration with GitlabCI (see https://docs.gitlab.com/ce/user/project/pipelines/settings.html).
+
+The JSON output is placed in a file named ```out-path/exec-filename/coverage.json```.
diff --git a/kcov-38/doc/jenkins.md b/kcov-38/doc/jenkins.md
new file mode 100644
index 000000000000..3babae72d1d5
--- /dev/null
+++ b/kcov-38/doc/jenkins.md
@@ -0,0 +1,6 @@
+Integration with Jenkins
+------------------------
+Kcov also outputs data in the Cobertura XML format, which allows integrating kcov
+output in Jenkins (see http://cobertura.sf.net and http://jenkins-ci.org).
+
+The Cobertura output is placed in a file named ```out-path/exec-filename/cobertura.xml```
diff --git a/kcov-38/doc/kcov.1 b/kcov-38/doc/kcov.1
new file mode 100644
index 000000000000..8fc0536dd060
--- /dev/null
+++ b/kcov-38/doc/kcov.1
@@ -0,0 +1,175 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KCOV 1 "November  24, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kcov \- Code coverage analysis for compiled programs and Python scripts
+.SH SYNOPSIS
+.B kcov
+.RI [ options ] " outdir executable [args-for-executable...]
+.PP
+.B kcov
+.RI --merge " outdir <path-to-coverage> [path-to-more-coverage...]
+.SH DESCRIPTION
+.PP
+This manual page documents briefly the \fBkcov\fP command. \fBkcov\fP is a
+code coverage tester for ELF binaries, Python scripts and shell scripts. It
+allows collecting code coverage information from executables without special
+compiler directives, and continuously produces output from long-running applications.
+
+See the GitHub page, https://github.com/SimonKagstrom/kcov, for more documentation.
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
+.\" respectively.
+.SH OPTIONS
+.TP
+\fB\-p\fP, \fB\-\-pid\fP=\fIPID\fP
+Trace PID instead of executing executable (passing the executable is optional
+for this case). Under this mode, coverage collection for shared libraries will not work.
+.TP
+\fB\-l\fP, \fB\-\-limits\fP=\fIlow,high\fP
+Setup limits for low/high coverage (default: 16,50).
+.TP
+\fB\-\-include\-path\fP=\fIP1\fP[\fI,P2\fP...]
+Comma-separated list of paths to include in the report.
+.TP
+\fB\-\-exclude\-path\fP=\fIP1\fP[\fI,P2\fP...]
+Comma-separated list of paths to exclude from the report.
+.TP
+\fB\-\-include\-pattern\fP=\fIP1\fP[\fI,P2\fP...]
+Comma-separated list of path patterns to include in the report.
+.TP
+\fB\-\-exclude\-pattern\fP=\fIP1\fP[\fI,P2\fP...]
+Comma-separated list of path patterns to exclude from the report.
+.TP
+\fB\-\-exclude\-line\fP=\fIP1\fP[\fI,P2\fP...]
+Comma-separated list of line patterns to exclude (mark as non-code)
+.TP
+\fB\-\-exclude\-region\fP=\fISTART:END\fP[\fI,START1:END1\fP...]
+Comma-separated list of regions of lines patterns to exclude (mark as non-code). The region begins with START and ends with END.
+.TP
+\fB\-\-collect\-only
+Only collect coverage data, don't produce HTML/Cobertura output.
+.TP
+\fB\-\-report\-only
+Only report HTML/Cobertura output, don't collect data.
+.TP
+\fB\-\-merge
+Merge the result of multiple kcov runs. Instead of a program to test, the output paths from previous runs should be given on the command line.
+.TP
+\fB\-\-coveralls\-id\fP=\fIid\fP
+Upload data to coveralls.io using secret repo_token or Travis CI service job ID \fIid\fP.
+The ID is taken as a repo_token if it's longer or equal to 32 characters.
+.SH UNCOMMON OPTIONS
+.TP
+\fB\-\-path\-strip\-level\fP=\fIN\fP
+Number of path levels to show for common paths (default: 2).
+.TP
+\fB\-\-skip\-solibs
+Skip coverage collection for shared libraries (improves performance)
+.TP
+\fB\-\-verify
+Verify that breakpoints are setup on instruction boundaries. This will slow down execution greatly, but can catch problems where the compiler generates bad DWARF data.
+.TP
+\fB\-\-exit\-first\-process
+exit when the first process exits, i.e., honor the behavior of daemons. The default behavior
+is to return to the console when the last process exits.
+.TP
+\fB\-\-python\-parser\fP=\fIPARSER\fP
+Set the python parser to use for Python programs (the default is python). Can be used to
+run with Python 3 on systems where Python 2 is the default.
+.TP
+\fB\-\-bash\-parser\fP=\fIPARSER\fP
+Set the bash parser to use for shell scripts (the default is /bin/bash).
+.TP
+\fB\-\-bash\-method\fP=\fIMETHOD\fP
+Use collection method \fIMETHOD\fP for bash scripts. The method can be either PS4, for use of
+the PS4 environment variable, or DEBUG for use of the DEBUG trap.
+.TP
+\fB\-\-bash\-handle\-sh\-invocation
+Handle invocations of /bin/sh scripts via using a LD_PRELOADed library that replaces execve (i.e., /bin/sh is
+executed as /bin/bash). Does not work well on some systems, so the default is not to use this.
+.TP
+\fB\-\-bash\-dont\-parse\-binary\-dir
+Kcov parses the directory of the binary for other scripts and add these to the report. If you don't
+want this behavior, this option turns that off.
+.TP
+\fB\-\-bash\-parse\-files\-in\-dir\fP=\fIP1\fP[\fI,P2\fP...]
+Parse directories for bash scripts.
+.TP
+\fB\-\-replace\-src\-path\fP=\fIP1\fP:\fIP2\fP
+Replace source file path P1 with P2, if found.
+.TP
+\fB\-\-system\-record
+Perform full-system instrumentation on a sysroot, outputting patched binaries which collect coverage data. See doc/full-system-instrumentation.md
+for more information on full-system instrumentation.
+.TP
+\fB\-\-system\-report
+Produce coverage output for a full-system coverage run.
+.RE
+.SH EXAMPLES
+.PP
+Check coverage for ./frodo and generate HTML output in /tmp/kcov and cobertura output in /tmp/kcov/frodo/cobertura.xml
+.PP
+.RS
+kcov /tmp/kcov ./frodo
+.RE
+.PP
+Check coverage for ./frodo but only include source files names with the string src/frodo
+.PP
+.RS
+kcov \-\-include\-pattern=src/frodo /tmp/kcov ./frodo
+.RE
+.PP
+Same as above but split collecting and reporting (perhaps on two different computers)
+.PP
+.RS
+kcov --collect-only /tmp/kcov ./frodo
+.PP
+kcov --report-only \-\-include\-pattern=src/frodo /tmp/kcov ./frodo
+.RE
+.SH HTML OUTPUT
+.PP
+The HTML output shows executed and non-executed lines of the source code. Some
+lines can map to multiple instrumentation points, for example for inlined functions
+(where every inlining of them will generate a separate instrumentation point).
+This is shown in the left column as 1/3 for example, which means that one of the
+three instrumentation points has been executed.
+.PP
+A special output link is [merged], which shows the union of all covered programs.
+This can be useful for example when you have unit tests in multiple binaries which
+share a subset of source files.
+.SH COBERTURA OUTPUT
+.PP
+Kcov also outputs data in the Cobertura XML format, which allows integrating kcov
+output in Jenkins (see http://cobertura.sf.net and http://jenkins-ci.org).
+.PP
+The Cobertura output is placed in a file named out-path/exec-filename/cobertura.xml.
+.SH JSON OUTPUT
+.PP
+Kcov generates a very generic json file which includes the overall percent covered
+for a single command and the count of lines instrumented and covered. It also includes
+a summary of each source file with a percentage and line counts. This allows easy
+integration with GitlabCI (see
+https://docs.gitlab.com/ce/user/project/pipelines/settings.html).
+.PP
+The JSON output is placed in a file named out-path/exec-filename/coverage.json.
+.SH AUTHOR
+.PP
+Kcov was written by Simon Kagstrom, building upon bcov by Thomas Neumann.
+.PP
+This manual page was written by Michael Tautschnig <mt@debian.org>,
+for the Debian project (but may be used by others).
diff --git a/kcov-38/doc/sonarqube.md b/kcov-38/doc/sonarqube.md
new file mode 100644
index 000000000000..e7facfa2de18
--- /dev/null
+++ b/kcov-38/doc/sonarqube.md
@@ -0,0 +1,5 @@
+Sonarqube integration
+---------------------
+Point the generic code coverage plugin to `/path/to/kcov-output/sonarqube.xml`.
+
+Someone with better knowledge about sonarqube should probably fill this in!
\ No newline at end of file
diff --git a/kcov-38/external/lldb/include/lldb/API/LLDB.h b/kcov-38/external/lldb/include/lldb/API/LLDB.h
new file mode 100644
index 000000000000..66e095395f13
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/LLDB.h
@@ -0,0 +1,57 @@
+//===-- LLDB.h --------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_LLDB_h_
+#define LLDB_LLDB_h_
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBBlock.h"
+#include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBBreakpointLocation.h"
+#include "lldb/API/SBBroadcaster.h"
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBCommandReturnObject.h"
+#include "lldb/API/SBCommunication.h"
+#include "lldb/API/SBCompileUnit.h"
+#include "lldb/API/SBData.h"
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBDeclaration.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBEvent.h"
+#include "lldb/API/SBExecutionContext.h"
+#include "lldb/API/SBFileSpec.h"
+#include "lldb/API/SBFrame.h"
+#include "lldb/API/SBFunction.h"
+#include "lldb/API/SBHostOS.h"
+#include "lldb/API/SBInstruction.h"
+#include "lldb/API/SBInstructionList.h"
+#include "lldb/API/SBLineEntry.h"
+#include "lldb/API/SBListener.h"
+#include "lldb/API/SBModule.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBQueue.h"
+#include "lldb/API/SBQueueItem.h"
+#include "lldb/API/SBSourceManager.h"
+#include "lldb/API/SBStream.h"
+#include "lldb/API/SBStringList.h"
+#include "lldb/API/SBSymbol.h"
+#include "lldb/API/SBSymbolContext.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBType.h"
+#include "lldb/API/SBValue.h"
+#include "lldb/API/SBValueList.h"
+#include "lldb/API/SBVariablesOptions.h"
+
+#endif  // LLDB_LLDB_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBAddress.h b/kcov-38/external/lldb/include/lldb/API/SBAddress.h
new file mode 100644
index 000000000000..4cbbee9fd132
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBAddress.h
@@ -0,0 +1,152 @@
+//===-- SBAddress.h ---------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBAddress_h_
+#define LLDB_SBAddress_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBModule.h"
+
+namespace lldb {
+
+class LLDB_API SBAddress
+{
+public:
+
+    SBAddress ();
+
+    SBAddress (const lldb::SBAddress &rhs);
+
+    SBAddress (lldb::SBSection section, lldb::addr_t offset);
+
+    // Create an address by resolving a load address using the supplied target
+    SBAddress (lldb::addr_t load_addr, lldb::SBTarget &target);
+
+    ~SBAddress ();
+
+    const lldb::SBAddress &
+    operator = (const lldb::SBAddress &rhs);
+
+    bool
+    IsValid () const;
+
+    void
+    Clear ();
+
+    addr_t
+    GetFileAddress () const;
+
+    addr_t
+    GetLoadAddress (const lldb::SBTarget &target) const;
+
+    void
+    SetAddress (lldb::SBSection section, lldb::addr_t offset);
+
+    void
+    SetLoadAddress (lldb::addr_t load_addr, 
+                    lldb::SBTarget &target);
+    bool
+    OffsetAddress (addr_t offset);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    // The following queries can lookup symbol information for a given address.
+    // An address might refer to code or data from an existing module, or it
+    // might refer to something on the stack or heap. The following functions
+    // will only return valid values if the address has been resolved to a code
+    // or data address using "void SBAddress::SetLoadAddress(...)" or 
+    // "lldb::SBAddress SBTarget::ResolveLoadAddress (...)". 
+    lldb::SBSymbolContext
+    GetSymbolContext (uint32_t resolve_scope);
+
+    
+    // The following functions grab individual objects for a given address and
+    // are less efficient if you want more than one symbol related objects. 
+    // Use one of the following when you want multiple debug symbol related 
+    // objects for an address:
+    //    lldb::SBSymbolContext SBAddress::GetSymbolContext (uint32_t resolve_scope);
+    //    lldb::SBSymbolContext SBTarget::ResolveSymbolContextForAddress (const SBAddress &addr, uint32_t resolve_scope);
+    // One or more bits from the SymbolContextItem enumerations can be logically
+    // OR'ed together to more efficiently retrieve multiple symbol objects.
+
+    lldb::SBSection
+    GetSection ();
+
+    lldb::addr_t
+    GetOffset ();
+
+    lldb::SBModule
+    GetModule ();
+    
+    lldb::SBCompileUnit
+    GetCompileUnit ();
+
+    lldb::SBFunction
+    GetFunction ();
+
+    lldb::SBBlock
+    GetBlock ();
+
+    lldb::SBSymbol
+    GetSymbol ();
+
+    lldb::SBLineEntry
+    GetLineEntry ();
+    
+    lldb::AddressClass
+    GetAddressClass ();
+
+protected:
+
+    friend class SBBlock;
+    friend class SBBreakpointLocation;
+    friend class SBFrame;
+    friend class SBFunction;
+    friend class SBLineEntry;
+    friend class SBInstruction;
+    friend class SBModule;
+    friend class SBSection;
+    friend class SBSymbol;
+    friend class SBSymbolContext;
+    friend class SBTarget;
+    friend class SBThread;
+    friend class SBThreadPlan;
+    friend class SBValue;
+    friend class SBQueueItem;
+
+    lldb_private::Address *
+    operator->();
+
+    const lldb_private::Address *
+    operator->() const;
+
+    lldb_private::Address *
+    get ();
+
+    lldb_private::Address &
+    ref();
+
+    const lldb_private::Address &
+    ref() const;
+
+    SBAddress (const lldb_private::Address *lldb_object_ptr);
+
+    void
+    SetAddress (const lldb_private::Address *lldb_object_ptr);
+
+private:
+
+    std::unique_ptr<lldb_private::Address> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBAddress_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h b/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
new file mode 100644
index 000000000000..712150e128be
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
@@ -0,0 +1,149 @@
+//===-- SBAttachInfo.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBAttachInfo_h_
+#define LLDB_SBAttachInfo_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class SBTarget;
+
+class LLDB_API SBAttachInfo
+{
+public:
+    SBAttachInfo ();
+
+    SBAttachInfo (lldb::pid_t pid);
+
+    SBAttachInfo (const char *path, bool wait_for);
+
+    SBAttachInfo (const SBAttachInfo &rhs);
+
+    ~SBAttachInfo();
+
+    SBAttachInfo &
+    operator = (const SBAttachInfo &rhs);
+
+    lldb::pid_t
+    GetProcessID ();
+
+    void
+    SetProcessID (lldb::pid_t pid);
+
+    void
+    SetExecutable (const char *path);
+
+    void
+    SetExecutable (lldb::SBFileSpec exe_file);
+
+    bool
+    GetWaitForLaunch ();
+
+    void
+    SetWaitForLaunch (bool b);
+
+    bool
+    GetIgnoreExisting ();
+
+    void
+    SetIgnoreExisting (bool b);
+
+    uint32_t
+    GetResumeCount ();
+
+    void
+    SetResumeCount (uint32_t c);
+
+    const char *
+    GetProcessPluginName ();
+
+    void
+    SetProcessPluginName (const char *plugin_name);
+
+    uint32_t
+    GetUserID();
+
+    uint32_t
+    GetGroupID();
+
+    bool
+    UserIDIsValid ();
+
+    bool
+    GroupIDIsValid ();
+
+    void
+    SetUserID (uint32_t uid);
+
+    void
+    SetGroupID (uint32_t gid);
+
+    uint32_t
+    GetEffectiveUserID();
+
+    uint32_t
+    GetEffectiveGroupID();
+
+    bool
+    EffectiveUserIDIsValid ();
+
+    bool
+    EffectiveGroupIDIsValid ();
+
+    void
+    SetEffectiveUserID (uint32_t uid);
+
+    void
+    SetEffectiveGroupID (uint32_t gid);
+
+    lldb::pid_t
+    GetParentProcessID ();
+
+    void
+    SetParentProcessID (lldb::pid_t pid);
+
+    bool
+    ParentProcessIDIsValid();
+
+    //----------------------------------------------------------------------
+    /// Get the listener that will be used to receive process events.
+    ///
+    /// If no listener has been set via a call to
+    /// SBLaunchInfo::SetListener(), then an invalid SBListener will be
+    /// returned (SBListener::IsValid() will return false). If a listener
+    /// has been set, then the valid listener object will be returned.
+    //----------------------------------------------------------------------
+    SBListener
+    GetListener ();
+
+    //----------------------------------------------------------------------
+    /// Set the listener that will be used to receive process events.
+    ///
+    /// By default the SBDebugger, which has a listener, that the SBTarget
+    /// belongs to will listen for the process events. Calling this function
+    /// allows a different listener to be used to listen for process events.
+    //----------------------------------------------------------------------
+    void
+    SetListener (SBListener &listener);
+
+
+protected:
+    friend class SBTarget;
+
+    lldb_private::ProcessAttachInfo &
+    ref ();
+
+    ProcessAttachInfoSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBAttachInfo_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBlock.h b/kcov-38/external/lldb/include/lldb/API/SBBlock.h
new file mode 100644
index 000000000000..a18eab02088b
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBBlock.h
@@ -0,0 +1,123 @@
+//===-- SBBlock.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBBlock_h_
+#define LLDB_SBBlock_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFrame.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBValueList.h"
+
+namespace lldb {
+
+class LLDB_API SBBlock
+{
+public:
+
+    SBBlock ();
+
+    SBBlock (const lldb::SBBlock &rhs);
+
+    ~SBBlock ();
+
+    const lldb::SBBlock &
+    operator = (const lldb::SBBlock &rhs);
+
+    bool
+    IsInlined () const;
+
+    bool
+    IsValid () const;
+
+    const char *
+    GetInlinedName () const;
+
+    lldb::SBFileSpec
+    GetInlinedCallSiteFile () const;
+
+    uint32_t 
+    GetInlinedCallSiteLine () const;
+
+    uint32_t
+    GetInlinedCallSiteColumn () const;
+
+    lldb::SBBlock
+    GetParent ();
+    
+    lldb::SBBlock
+    GetSibling ();
+    
+    lldb::SBBlock
+    GetFirstChild ();
+
+    uint32_t
+    GetNumRanges ();
+
+    lldb::SBAddress
+    GetRangeStartAddress (uint32_t idx);
+
+    lldb::SBAddress
+    GetRangeEndAddress (uint32_t idx);
+
+    uint32_t
+    GetRangeIndexForBlockAddress (lldb::SBAddress block_addr);
+
+    lldb::SBValueList
+    GetVariables (lldb::SBFrame& frame,
+                  bool arguments,
+                  bool locals,
+                  bool statics,
+                  lldb::DynamicValueType use_dynamic);
+    
+    lldb::SBValueList
+    GetVariables (lldb::SBTarget& target,
+                  bool arguments,
+                  bool locals,
+                  bool statics);
+    //------------------------------------------------------------------
+    /// Get the inlined block that contains this block.
+    ///
+    /// @return
+    ///     If this block is inlined, it will return this block, else 
+    ///     parent blocks will be searched to see if any contain this 
+    ///     block and are themselves inlined. An invalid SBBlock will 
+    ///     be returned if this block nor any parent blocks are inlined
+    ///     function blocks.
+    //------------------------------------------------------------------
+    lldb::SBBlock
+    GetContainingInlinedBlock ();
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+private:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBFunction;
+    friend class SBSymbolContext;
+
+    lldb_private::Block *
+    GetPtr ();
+
+    void
+    SetPtr (lldb_private::Block *lldb_object_ptr);
+
+    SBBlock (lldb_private::Block *lldb_object_ptr);
+
+    void
+    AppendVariables (bool can_create, bool get_parent_variables, lldb_private::VariableList *var_list);
+
+    lldb_private::Block *m_opaque_ptr;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBBlock_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h b/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
new file mode 100644
index 000000000000..c244ab8a9b48
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
@@ -0,0 +1,193 @@
+//===-- SBBreakpoint.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBBreakpoint_h_
+#define LLDB_SBBreakpoint_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBBreakpoint
+{
+public:
+
+    typedef bool (*BreakpointHitCallback) (void *baton, 
+                                           SBProcess &process,
+                                           SBThread &thread, 
+                                           lldb::SBBreakpointLocation &location);
+
+    SBBreakpoint ();
+
+    SBBreakpoint (const lldb::SBBreakpoint& rhs);
+
+    ~SBBreakpoint();
+
+    const lldb::SBBreakpoint &
+    operator = (const lldb::SBBreakpoint& rhs);
+    
+    // Tests to see if the opaque breakpoint object in this object matches the
+    // opaque breakpoint object in "rhs".
+    bool
+    operator == (const lldb::SBBreakpoint& rhs);
+
+    bool
+    operator != (const lldb::SBBreakpoint& rhs);
+    
+    break_id_t
+    GetID () const;
+
+    bool
+    IsValid() const;
+
+    void
+    ClearAllBreakpointSites ();
+
+    lldb::SBBreakpointLocation
+    FindLocationByAddress (lldb::addr_t vm_addr);
+
+    lldb::break_id_t
+    FindLocationIDByAddress (lldb::addr_t vm_addr);
+
+    lldb::SBBreakpointLocation
+    FindLocationByID (lldb::break_id_t bp_loc_id);
+
+    lldb::SBBreakpointLocation
+    GetLocationAtIndex (uint32_t index);
+
+    void
+    SetEnabled (bool enable);
+
+    bool
+    IsEnabled ();
+    
+    void
+    SetOneShot (bool one_shot);
+
+    bool
+    IsOneShot () const;
+    
+    bool
+    IsInternal ();
+
+    uint32_t
+    GetHitCount () const;
+
+    void
+    SetIgnoreCount (uint32_t count);
+
+    uint32_t
+    GetIgnoreCount () const;
+    
+    void 
+    SetCondition (const char *condition);
+    
+    const char *
+    GetCondition ();
+
+    void
+    SetThreadID (lldb::tid_t sb_thread_id);
+
+    lldb::tid_t
+    GetThreadID ();
+    
+    void
+    SetThreadIndex (uint32_t index);
+    
+    uint32_t
+    GetThreadIndex() const;
+    
+    void
+    SetThreadName (const char *thread_name);
+    
+    const char *
+    GetThreadName () const;
+    
+    void 
+    SetQueueName (const char *queue_name);
+    
+    const char *
+    GetQueueName () const;
+
+    void
+    SetCallback (BreakpointHitCallback callback, void *baton);
+    
+    void
+    SetScriptCallbackFunction (const char *callback_function_name);
+    
+    SBError
+    SetScriptCallbackBody (const char *script_body_text);
+
+    bool
+    AddName (const char *new_name);
+
+    void
+    RemoveName (const char *name_to_remove);
+
+    bool
+    MatchesName (const char *name);
+
+    void
+    GetNames (SBStringList &names);
+    
+    size_t
+    GetNumResolvedLocations() const;
+
+    size_t
+    GetNumLocations() const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    static bool
+    EventIsBreakpointEvent (const lldb::SBEvent &event);
+    
+    static lldb::BreakpointEventType
+    GetBreakpointEventTypeFromEvent (const lldb::SBEvent& event);
+
+    static lldb::SBBreakpoint
+    GetBreakpointFromEvent (const lldb::SBEvent& event);
+    
+    static lldb::SBBreakpointLocation
+    GetBreakpointLocationAtIndexFromEvent (const lldb::SBEvent& event, uint32_t loc_idx);
+    
+    static uint32_t
+    GetNumBreakpointLocationsFromEvent (const lldb::SBEvent &event_sp);
+
+
+private:
+    friend class SBBreakpointLocation;
+    friend class SBTarget;
+
+    SBBreakpoint (const lldb::BreakpointSP &bp_sp);
+
+    lldb_private::Breakpoint *
+    operator->() const;
+
+    lldb_private::Breakpoint *
+    get() const;
+
+    lldb::BreakpointSP &
+    operator *();
+
+    const lldb::BreakpointSP &
+    operator *() const;
+
+    static bool
+    PrivateBreakpointHitCallback (void *baton, 
+                                  lldb_private::StoppointCallbackContext *context, 
+                                  lldb::user_id_t break_id, 
+                                  lldb::user_id_t break_loc_id);
+    
+    lldb::BreakpointSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBBreakpoint_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h b/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
new file mode 100644
index 000000000000..ab7049739c0b
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
@@ -0,0 +1,114 @@
+//===-- SBBreakpointLocation.h ----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBBreakpointLocation_h_
+#define LLDB_SBBreakpointLocation_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBreakpoint.h"
+
+namespace lldb {
+
+class LLDB_API SBBreakpointLocation
+{
+public:
+
+    SBBreakpointLocation ();
+
+    SBBreakpointLocation (const lldb::SBBreakpointLocation &rhs);
+
+    ~SBBreakpointLocation ();
+
+    const lldb::SBBreakpointLocation &
+    operator = (const lldb::SBBreakpointLocation &rhs);
+
+    break_id_t
+    GetID ();
+    
+    bool
+    IsValid() const;
+
+    lldb::SBAddress
+    GetAddress ();
+    
+    lldb::addr_t
+    GetLoadAddress ();
+
+    void
+    SetEnabled(bool enabled);
+
+    bool
+    IsEnabled ();
+
+    uint32_t
+    GetIgnoreCount ();
+
+    void
+    SetIgnoreCount (uint32_t n);
+
+    void 
+    SetCondition (const char *condition);
+    
+    const char *
+    GetCondition ();
+
+    void
+    SetScriptCallbackFunction (const char *callback_function_name);
+
+    SBError
+    SetScriptCallbackBody (const char *script_body_text);
+    
+    void
+    SetThreadID (lldb::tid_t sb_thread_id);
+
+    lldb::tid_t
+    GetThreadID ();
+    
+    void
+    SetThreadIndex (uint32_t index);
+    
+    uint32_t
+    GetThreadIndex() const;
+    
+    void
+    SetThreadName (const char *thread_name);
+    
+    const char *
+    GetThreadName () const;
+    
+    void 
+    SetQueueName (const char *queue_name);
+    
+    const char *
+    GetQueueName () const;
+
+    bool
+    IsResolved ();
+
+    bool
+    GetDescription (lldb::SBStream &description, DescriptionLevel level);
+
+    SBBreakpoint
+    GetBreakpoint ();
+
+    SBBreakpointLocation (const lldb::BreakpointLocationSP &break_loc_sp);
+
+private:
+    friend class SBBreakpoint;
+
+    void
+    SetLocation (const lldb::BreakpointLocationSP &break_loc_sp);
+
+    lldb::BreakpointLocationSP m_opaque_sp;
+
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBBreakpointLocation_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h b/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
new file mode 100644
index 000000000000..28b6686b79b3
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
@@ -0,0 +1,97 @@
+//===-- SBBroadcaster.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBBroadcaster_h_
+#define LLDB_SBBroadcaster_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBBroadcaster
+{
+public:
+    SBBroadcaster ();
+
+    SBBroadcaster (const char *name);
+
+    SBBroadcaster (const SBBroadcaster &rhs);
+    
+    const SBBroadcaster &
+    operator = (const SBBroadcaster &rhs);
+
+    ~SBBroadcaster();
+
+    bool
+    IsValid () const;
+
+    void
+    Clear ();
+
+    void
+    BroadcastEventByType (uint32_t event_type, bool unique = false);
+
+    void
+    BroadcastEvent (const lldb::SBEvent &event, bool unique = false);
+
+    void
+    AddInitialEventsToListener (const lldb::SBListener &listener, uint32_t requested_events);
+
+    uint32_t
+    AddListener (const lldb::SBListener &listener, uint32_t event_mask);
+
+    const char *
+    GetName () const;
+
+    bool
+    EventTypeHasListeners (uint32_t event_type);
+
+    bool
+    RemoveListener (const lldb::SBListener &listener, uint32_t event_mask = UINT32_MAX);
+
+    // This comparison is checking if the internal opaque pointer value
+    // is equal to that in "rhs".
+    bool
+    operator == (const lldb::SBBroadcaster &rhs) const;
+
+    // This comparison is checking if the internal opaque pointer value
+    // is not equal to that in "rhs".
+    bool
+    operator != (const lldb::SBBroadcaster &rhs) const;
+
+    // This comparison is checking if the internal opaque pointer value
+    // is less than that in "rhs" so SBBroadcaster objects can be contained
+    // in ordered containers.
+    bool
+    operator < (const lldb::SBBroadcaster &rhs) const;
+
+protected:
+    friend class SBCommandInterpreter;
+    friend class SBCommunication;
+    friend class SBEvent;
+    friend class SBListener;
+    friend class SBProcess;
+    friend class SBTarget;
+
+    SBBroadcaster (lldb_private::Broadcaster *broadcaster, bool owns);
+
+    lldb_private::Broadcaster *
+    get () const;
+
+    void
+    reset (lldb_private::Broadcaster *broadcaster, bool owns);
+
+private:
+    lldb::BroadcasterSP m_opaque_sp;
+    lldb_private::Broadcaster *m_opaque_ptr;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBBroadcaster_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h b/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
new file mode 100644
index 000000000000..235a2f3ea603
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
@@ -0,0 +1,318 @@
+//===-- SBCommandInterpreter.h ----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBCommandInterpreter_h_
+#define LLDB_SBCommandInterpreter_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBDebugger.h"
+
+namespace lldb {
+
+class LLDB_API SBCommandInterpreterRunOptions
+{
+friend class SBDebugger;
+friend class SBCommandInterpreter;
+
+public:
+    SBCommandInterpreterRunOptions();
+    ~SBCommandInterpreterRunOptions();
+
+    bool
+    GetStopOnContinue () const;
+
+    void
+    SetStopOnContinue (bool);
+
+    bool
+    GetStopOnError () const;
+
+    void
+    SetStopOnError (bool);
+
+    bool
+    GetStopOnCrash () const;
+
+    void
+    SetStopOnCrash (bool);
+
+    bool
+    GetEchoCommands () const;
+
+    void
+    SetEchoCommands (bool);
+
+    bool
+    GetPrintResults () const;
+
+    void
+    SetPrintResults (bool);
+
+    bool
+    GetAddToHistory () const;
+
+    void
+    SetAddToHistory (bool);
+private:
+    lldb_private::CommandInterpreterRunOptions *
+    get () const;
+
+    lldb_private::CommandInterpreterRunOptions &
+    ref () const;
+
+    // This is set in the constructor and will always be valid.
+    mutable std::unique_ptr<lldb_private::CommandInterpreterRunOptions> m_opaque_up;
+};
+
+class SBCommandInterpreter
+{
+public:
+    enum
+    {
+        eBroadcastBitThreadShouldExit       = (1 << 0),
+        eBroadcastBitResetPrompt            = (1 << 1),
+        eBroadcastBitQuitCommandReceived    = (1 << 2),           // User entered quit 
+        eBroadcastBitAsynchronousOutputData = (1 << 3),
+        eBroadcastBitAsynchronousErrorData  = (1 << 4)
+    };
+
+    SBCommandInterpreter (const lldb::SBCommandInterpreter &rhs);
+    
+    const lldb::SBCommandInterpreter &
+    operator = (const lldb::SBCommandInterpreter &rhs);
+
+    ~SBCommandInterpreter ();
+
+    static const char * 
+    GetArgumentTypeAsCString (const lldb::CommandArgumentType arg_type);
+    
+    static const char *
+    GetArgumentDescriptionAsCString (const lldb::CommandArgumentType arg_type);
+
+    static bool
+    EventIsCommandInterpreterEvent (const lldb::SBEvent &event);
+    
+    bool
+    IsValid() const;
+
+    bool
+    CommandExists (const char *cmd);
+
+    bool
+    AliasExists (const char *cmd);
+
+    lldb::SBBroadcaster
+    GetBroadcaster ();
+    
+    static const char *
+    GetBroadcasterClass ();
+
+    bool
+    HasCommands ();
+
+    bool
+    HasAliases ();
+
+    bool
+    HasAliasOptions ();
+
+    lldb::SBProcess
+    GetProcess ();
+    
+    lldb::SBDebugger
+    GetDebugger ();
+    
+    lldb::SBCommand
+    AddMultiwordCommand (const char* name, const char* help);
+    
+    lldb::SBCommand
+    AddCommand (const char* name, lldb::SBCommandPluginInterface *impl, const char* help);
+
+    void
+    SourceInitFileInHomeDirectory (lldb::SBCommandReturnObject &result);
+
+    void
+    SourceInitFileInCurrentWorkingDirectory (lldb::SBCommandReturnObject &result);
+
+    lldb::ReturnStatus
+    HandleCommand (const char *command_line, lldb::SBCommandReturnObject &result, bool add_to_history = false);
+
+    lldb::ReturnStatus
+    HandleCommand (const char *command_line, SBExecutionContext &exe_ctx, SBCommandReturnObject &result, bool add_to_history = false);
+
+    void
+    HandleCommandsFromFile (lldb::SBFileSpec &file,
+                            lldb::SBExecutionContext &override_context,
+                            lldb::SBCommandInterpreterRunOptions &options,
+                            lldb::SBCommandReturnObject result);
+
+    // The pointer based interface is not useful in SWIG, since the cursor & last_char arguments are string pointers INTO current_line
+    // and you can't do that in a scripting language interface in general...
+    
+    // In either case, the way this works is that the you give it a line and cursor position in the line.  The function
+    // will return the number of completions.  The matches list will contain number_of_completions + 1 elements.  The first
+    // element is the common substring after the cursor position for all the matches.  The rest of the elements are the
+    // matches.  The first element is useful if you are emulating the common shell behavior where the tab completes
+    // to the string that is common among all the matches, then you should first check if the first element is non-empty,
+    // and if so just insert it and move the cursor to the end of the insertion.  The next tab will return an empty
+    // common substring, and a list of choices (if any), at which point you should display the choices and let the user
+    // type further to disambiguate.
+    
+    int
+    HandleCompletion (const char *current_line,
+                      const char *cursor,
+                      const char *last_char,
+                      int match_start_point,
+                      int max_return_elements,
+                      lldb::SBStringList &matches);
+
+    int
+    HandleCompletion (const char *current_line,
+                      uint32_t cursor_pos,
+                      int match_start_point,
+                      int max_return_elements,
+                      lldb::SBStringList &matches);
+
+    // Catch commands before they execute by registering a callback that will
+    // get called when the command gets executed. This allows GUI or command
+    // line interfaces to intercept a command and stop it from happening
+    bool
+    SetCommandOverrideCallback (const char *command_name,
+                                lldb::CommandOverrideCallback callback,
+                                void *baton);
+    
+    SBCommandInterpreter (lldb_private::CommandInterpreter *interpreter_ptr = NULL);   // Access using SBDebugger::GetCommandInterpreter();
+    
+    //----------------------------------------------------------------------
+    /// Return true if the command interpreter is the active IO handler.
+    ///
+    /// This indicates that any input coming into the debugger handles will
+    /// go to the command interpreter and will result in LLDB command line
+    /// commands being executed.
+    //----------------------------------------------------------------------
+    bool
+    IsActive ();
+    
+    //----------------------------------------------------------------------
+    /// Get the string that needs to be written to the debugger stdin file
+    /// handle when a control character is typed.
+    ///
+    /// Some GUI programs will intercept "control + char" sequences and want
+    /// to have them do what normally would happen when using a real
+    /// terminal, so this function allows GUI programs to emulate this
+    /// functionality.
+    ///
+    /// @param[in] ch
+    ///     The character that was typed along with the control key
+    ///
+    /// @return
+    ///     The string that should be written into the file handle that is
+    ///     feeding the input stream for the debugger, or NULL if there is
+    ///     no string for this control key.
+    //----------------------------------------------------------------------
+    const char *
+    GetIOHandlerControlSequence(char ch);
+
+    bool
+    GetPromptOnQuit();
+
+    void
+    SetPromptOnQuit(bool b);
+
+    //----------------------------------------------------------------------
+    /// Resolve the command just as HandleCommand would, expanding abbreviations
+    /// and aliases.  If successful, result->GetOutput has the full expansion.
+    //----------------------------------------------------------------------
+    void
+    ResolveCommand(const char *command_line, SBCommandReturnObject &result);
+
+protected:
+
+    lldb_private::CommandInterpreter &
+    ref ();
+
+    lldb_private::CommandInterpreter *
+    get ();
+
+    void
+    reset (lldb_private::CommandInterpreter *);
+private:
+    friend class SBDebugger;
+
+    static void
+    InitializeSWIG ();
+
+    lldb_private::CommandInterpreter *m_opaque_ptr;
+};
+
+class SBCommandPluginInterface
+{
+public:
+    virtual bool
+    DoExecute (lldb::SBDebugger /*debugger*/,
+               char** /*command*/,
+               lldb::SBCommandReturnObject & /*result*/)
+    {
+        return false;
+    }
+    
+    virtual
+    ~SBCommandPluginInterface ()
+    {}
+};
+    
+class SBCommand
+{
+public:
+    
+    SBCommand ();
+    
+    bool
+    IsValid ();
+    
+    const char*
+    GetName ();
+    
+    const char*
+    GetHelp ();
+    
+    const char*
+    GetHelpLong ();
+    
+    void
+    SetHelp (const char*);
+    
+    void
+    SetHelpLong (const char*);
+    
+    uint32_t
+    GetFlags ();
+    
+    void
+    SetFlags (uint32_t flags);
+    
+    lldb::SBCommand
+    AddMultiwordCommand (const char* name, const char* help = NULL);
+    
+    lldb::SBCommand
+    AddCommand (const char* name, lldb::SBCommandPluginInterface* impl, const char* help = NULL);
+    
+private:
+    
+    friend class SBDebugger;
+    friend class SBCommandInterpreter;
+    
+    SBCommand (lldb::CommandObjectSP cmd_sp);
+    
+    lldb::CommandObjectSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBCommandInterpreter_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h b/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
new file mode 100644
index 000000000000..c51d6bc8d2d5
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
@@ -0,0 +1,133 @@
+//===-- SBCommandReturnObject.h ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBCommandReturnObject_h_
+#define LLDB_SBCommandReturnObject_h_
+
+#include <stdio.h>
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBCommandReturnObject
+{
+public:
+
+    SBCommandReturnObject ();
+
+    SBCommandReturnObject (const lldb::SBCommandReturnObject &rhs);
+
+    const lldb::SBCommandReturnObject &
+    operator = (const lldb::SBCommandReturnObject &rhs);
+    
+
+    SBCommandReturnObject (lldb_private::CommandReturnObject *ptr);
+    
+    lldb_private::CommandReturnObject *
+    Release ();
+
+    ~SBCommandReturnObject ();
+
+    bool
+    IsValid() const;
+
+    const char *
+    GetOutput ();
+
+    const char *
+    GetError ();
+
+    size_t
+    PutOutput (FILE *fh);
+
+    size_t
+    GetOutputSize ();
+
+    size_t
+    GetErrorSize ();
+
+    size_t
+    PutError (FILE *fh);
+
+    void
+    Clear();
+
+    lldb::ReturnStatus
+    GetStatus();
+    
+    void
+    SetStatus (lldb::ReturnStatus status);
+
+    bool
+    Succeeded ();
+
+    bool
+    HasResult ();
+
+    void
+    AppendMessage (const char *message);
+
+    void
+    AppendWarning (const char *message);
+    
+    bool
+    GetDescription (lldb::SBStream &description);
+    
+    void
+    SetImmediateOutputFile (FILE *fh);
+    
+    void
+    SetImmediateErrorFile (FILE *fh);
+    
+    void
+    PutCString(const char* string, int len = -1);
+    
+    size_t
+    Printf(const char* format, ...)  __attribute__ ((format (printf, 2, 3)));
+    
+    const char *
+    GetOutput (bool only_if_no_immediate);
+    
+    const char *
+    GetError (bool only_if_no_immediate);
+    
+    void
+    SetError (lldb::SBError &error,
+              const char *fallback_error_cstr = NULL);
+    
+    void
+    SetError (const char* error_cstr);
+    
+protected:
+    friend class SBCommandInterpreter;
+    friend class SBOptions;
+
+    lldb_private::CommandReturnObject *
+    operator->() const;
+
+    lldb_private::CommandReturnObject *
+    get() const;
+
+    lldb_private::CommandReturnObject &
+    operator*() const;
+
+    lldb_private::CommandReturnObject &
+    ref() const;
+
+    void
+    SetLLDBObjectPtr (lldb_private::CommandReturnObject *ptr);
+
+ private:
+    std::unique_ptr<lldb_private::CommandReturnObject> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif        // LLDB_SBCommandReturnObject_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommunication.h b/kcov-38/external/lldb/include/lldb/API/SBCommunication.h
new file mode 100644
index 000000000000..c4b2709de8ab
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBCommunication.h
@@ -0,0 +1,100 @@
+//===-- SBCommunication.h ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBCommunication_h_
+#define LLDB_SBCommunication_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
+
+namespace lldb {
+
+class LLDB_API SBCommunication
+{
+public:
+    FLAGS_ANONYMOUS_ENUM()
+    {
+        eBroadcastBitDisconnected           = (1 << 0), ///< Sent when the communications connection is lost.
+        eBroadcastBitReadThreadGotBytes     = (1 << 1), ///< Sent by the read thread when bytes become available.
+        eBroadcastBitReadThreadDidExit      = (1 << 2), ///< Sent by the read thread when it exits to inform clients.
+        eBroadcastBitReadThreadShouldExit   = (1 << 3), ///< Sent by clients that need to cancel the read thread.
+        eBroadcastBitPacketAvailable        = (1 << 4), ///< Sent when data received makes a complete packet.
+        eAllEventBits                       = 0xffffffff
+    };
+
+    typedef void (*ReadThreadBytesReceived) (void *baton, const void *src, size_t src_len);
+
+    SBCommunication ();
+    SBCommunication (const char * broadcaster_name);
+   ~SBCommunication ();
+
+
+    bool
+    IsValid () const;
+
+    lldb::SBBroadcaster
+    GetBroadcaster ();
+    
+    static const char *GetBroadcasterClass();
+
+    lldb::ConnectionStatus
+    AdoptFileDesriptor (int fd, bool owns_fd);
+
+    lldb::ConnectionStatus
+    Connect (const char *url);
+
+    lldb::ConnectionStatus
+    Disconnect ();
+
+    bool
+    IsConnected () const;
+
+    bool
+    GetCloseOnEOF ();
+
+    void
+    SetCloseOnEOF (bool b);
+
+    size_t
+    Read (void *dst,
+          size_t dst_len,
+          uint32_t timeout_usec,
+          lldb::ConnectionStatus &status);
+
+    size_t
+    Write (const void *src,
+           size_t src_len,
+           lldb::ConnectionStatus &status);
+
+    bool
+    ReadThreadStart ();
+
+    bool
+    ReadThreadStop ();
+
+    bool
+    ReadThreadIsRunning ();
+
+    bool
+    SetReadThreadBytesReceivedCallback (ReadThreadBytesReceived callback,
+                                        void *callback_baton);
+
+
+private:
+
+    DISALLOW_COPY_AND_ASSIGN (SBCommunication);
+
+    lldb_private::Communication *m_opaque;
+    bool m_opaque_owned;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBCommunication_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h b/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
new file mode 100644
index 000000000000..a53d556679c4
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
@@ -0,0 +1,119 @@
+//===-- SBCompileUnit.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBCompileUnit_h_
+#define LLDB_SBCompileUnit_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
+
+namespace lldb {
+
+class LLDB_API SBCompileUnit
+{
+public:
+
+    SBCompileUnit ();
+
+    SBCompileUnit (const lldb::SBCompileUnit &rhs);
+
+    ~SBCompileUnit ();
+
+    const lldb::SBCompileUnit &
+    operator = (const lldb::SBCompileUnit &rhs);
+
+    bool
+    IsValid () const;
+
+    lldb::SBFileSpec
+    GetFileSpec () const;
+
+    uint32_t
+    GetNumLineEntries () const;
+
+    lldb::SBLineEntry
+    GetLineEntryAtIndex (uint32_t idx) const;
+
+    uint32_t
+    FindLineEntryIndex (uint32_t start_idx,
+                        uint32_t line,
+                        lldb::SBFileSpec *inline_file_spec) const;
+
+    uint32_t
+    FindLineEntryIndex (uint32_t start_idx,
+                        uint32_t line,
+                        lldb::SBFileSpec *inline_file_spec,
+                        bool exact) const;
+
+    SBFileSpec
+    GetSupportFileAtIndex (uint32_t idx) const;
+
+    uint32_t
+    GetNumSupportFiles () const;
+
+    uint32_t
+    FindSupportFileIndex (uint32_t start_idx, const SBFileSpec &sb_file, bool full);
+    
+    //------------------------------------------------------------------
+    /// Get all types matching \a type_mask from debug info in this
+    /// compile unit.
+    ///
+    /// @param[in] type_mask
+    ///    A bitfield that consists of one or more bits logically OR'ed
+    ///    together from the lldb::TypeClass enumeration. This allows
+    ///    you to request only structure types, or only class, struct
+    ///    and union types. Passing in lldb::eTypeClassAny will return
+    ///    all types found in the debug information for this compile
+    ///    unit.
+    ///
+    /// @return
+    ///    A list of types in this compile unit that match \a type_mask
+    //------------------------------------------------------------------
+    lldb::SBTypeList
+    GetTypes (uint32_t type_mask = lldb::eTypeClassAny);
+
+    lldb::LanguageType
+    GetLanguage ();
+    
+    bool
+    operator == (const lldb::SBCompileUnit &rhs) const;
+
+    bool
+    operator != (const lldb::SBCompileUnit &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+private:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBSymbolContext;
+    friend class SBModule;
+
+    SBCompileUnit (lldb_private::CompileUnit *lldb_object_ptr);
+
+    const lldb_private::CompileUnit *
+    operator->() const;
+
+    const lldb_private::CompileUnit &
+    operator*() const;
+    
+    lldb_private::CompileUnit *
+    get ();
+    
+    void
+    reset (lldb_private::CompileUnit *lldb_object_ptr);
+
+    lldb_private::CompileUnit *m_opaque_ptr;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBCompileUnit_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBData.h b/kcov-38/external/lldb/include/lldb/API/SBData.h
new file mode 100644
index 000000000000..a2bd72fad570
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBData.h
@@ -0,0 +1,181 @@
+//===-- SBData.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBData_h_
+#define LLDB_SBData_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBData
+{
+public:
+
+    SBData ();
+
+    SBData (const SBData &rhs);
+    
+    const SBData &
+    operator = (const SBData &rhs);
+
+    ~SBData ();
+    
+    uint8_t
+    GetAddressByteSize ();
+    
+    void
+    SetAddressByteSize (uint8_t addr_byte_size);
+    
+    void
+    Clear ();
+    
+    bool
+    IsValid();
+    
+    size_t
+    GetByteSize ();
+    
+    lldb::ByteOrder
+    GetByteOrder();
+    
+    void
+    SetByteOrder (lldb::ByteOrder endian);
+    
+    float
+    GetFloat (lldb::SBError& error, lldb::offset_t offset);
+    
+    double
+    GetDouble (lldb::SBError& error, lldb::offset_t offset);
+
+    long double
+    GetLongDouble (lldb::SBError& error, lldb::offset_t offset);
+    
+    lldb::addr_t
+    GetAddress (lldb::SBError& error, lldb::offset_t offset);
+    
+    uint8_t
+    GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset);
+
+    uint16_t
+    GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset);
+
+    uint32_t
+    GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset);
+
+    uint64_t
+    GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset);
+    
+    int8_t
+    GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset);
+    
+    int16_t
+    GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset);
+    
+    int32_t
+    GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset);
+    
+    int64_t
+    GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset);
+    
+    const char*
+    GetString (lldb::SBError& error, lldb::offset_t offset);
+    
+    size_t
+    ReadRawData (lldb::SBError& error,
+                 lldb::offset_t offset,
+                 void *buf,
+                 size_t size);
+    
+    bool
+    GetDescription (lldb::SBStream &description, lldb::addr_t base_addr = LLDB_INVALID_ADDRESS);
+    
+    // it would be nice to have SetData(SBError, const void*, size_t) when endianness and address size can be
+    // inferred from the existing DataExtractor, but having two SetData() signatures triggers a SWIG bug where
+    // the typemap isn't applied before resolving the overload, and thus the right function never gets called
+    void
+    SetData (lldb::SBError& error, const void *buf, size_t size, lldb::ByteOrder endian, uint8_t addr_size);
+    
+    // see SetData() for why we don't have Append(const void* buf, size_t size)
+    bool
+    Append (const SBData& rhs);
+    
+    static lldb::SBData
+    CreateDataFromCString (lldb::ByteOrder endian, uint32_t addr_byte_size, const char* data);
+    
+    // in the following CreateData*() and SetData*() prototypes, the two parameters array and array_len
+    // should not be renamed or rearranged, because doing so will break the SWIG typemap
+    static lldb::SBData
+    CreateDataFromUInt64Array (lldb::ByteOrder endian, uint32_t addr_byte_size, uint64_t* array, size_t array_len);
+    
+    static lldb::SBData
+    CreateDataFromUInt32Array (lldb::ByteOrder endian, uint32_t addr_byte_size, uint32_t* array, size_t array_len);
+    
+    static lldb::SBData
+    CreateDataFromSInt64Array (lldb::ByteOrder endian, uint32_t addr_byte_size, int64_t* array, size_t array_len);
+    
+    static lldb::SBData
+    CreateDataFromSInt32Array (lldb::ByteOrder endian, uint32_t addr_byte_size, int32_t* array, size_t array_len);
+    
+    static lldb::SBData
+    CreateDataFromDoubleArray (lldb::ByteOrder endian, uint32_t addr_byte_size, double* array, size_t array_len);
+    
+    bool
+    SetDataFromCString (const char* data);
+    
+    bool
+    SetDataFromUInt64Array (uint64_t* array, size_t array_len);
+    
+    bool
+    SetDataFromUInt32Array (uint32_t* array, size_t array_len);
+    
+    bool
+    SetDataFromSInt64Array (int64_t* array, size_t array_len);
+    
+    bool
+    SetDataFromSInt32Array (int32_t* array, size_t array_len);
+    
+    bool
+    SetDataFromDoubleArray (double* array, size_t array_len);
+
+    
+protected:
+    
+    // Mimic shared pointer...
+    lldb_private::DataExtractor *
+    get() const;
+    
+    lldb_private::DataExtractor *
+    operator->() const;
+    
+    lldb::DataExtractorSP &
+    operator*();
+    
+    const lldb::DataExtractorSP &
+    operator*() const;
+
+    SBData (const lldb::DataExtractorSP &data_sp);
+
+    void
+    SetOpaque (const lldb::DataExtractorSP &data_sp);
+
+private:
+    friend class SBInstruction;
+    friend class SBProcess;
+    friend class SBSection;
+    friend class SBTarget;
+    friend class SBValue;
+
+    lldb::DataExtractorSP  m_opaque_sp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBData_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDebugger.h b/kcov-38/external/lldb/include/lldb/API/SBDebugger.h
new file mode 100644
index 000000000000..4f2c1d7f8756
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBDebugger.h
@@ -0,0 +1,363 @@
+//===-- SBDebugger.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBDebugger_h_
+#define LLDB_SBDebugger_h_
+
+#include <stdio.h>
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBPlatform.h"
+
+namespace lldb {
+
+    
+class LLDB_API SBInputReader
+{
+public:
+    SBInputReader();
+    ~SBInputReader();
+    SBError Initialize(lldb::SBDebugger&, unsigned long (*)(void*, lldb::SBInputReader*, lldb::InputReaderAction, char const*, unsigned long), void*, lldb::InputReaderGranularity, char const*, char const*, bool);
+    void SetIsDone(bool);
+    bool IsActive() const;
+};
+
+class LLDB_API SBDebugger
+{
+public:
+
+    static void
+    Initialize();
+    
+    static void
+    Terminate();
+    
+    // Deprecated, use the one that takes a source_init_files bool.
+    static lldb::SBDebugger
+    Create();
+
+    static lldb::SBDebugger
+    Create(bool source_init_files);
+
+    static lldb::SBDebugger
+    Create(bool source_init_files, lldb::LogOutputCallback log_callback, void *baton);
+
+    static void
+    Destroy (lldb::SBDebugger &debugger);
+
+    static void
+    MemoryPressureDetected ();
+
+    SBDebugger();
+
+    SBDebugger(const lldb::SBDebugger &rhs);
+
+    SBDebugger(const lldb::DebuggerSP &debugger_sp);
+    
+    lldb::SBDebugger &
+    operator = (const lldb::SBDebugger &rhs);
+    
+    ~SBDebugger();
+
+    bool
+    IsValid() const;
+
+    void
+    Clear ();
+
+    void
+    SetAsync (bool b);
+    
+    bool 
+    GetAsync ();
+
+    void
+    SkipLLDBInitFiles (bool b);
+
+    void
+    SkipAppInitFiles (bool b);
+
+    void
+    SetInputFileHandle (FILE *f, bool transfer_ownership);
+
+    void
+    SetOutputFileHandle (FILE *f, bool transfer_ownership);
+
+    void
+    SetErrorFileHandle (FILE *f, bool transfer_ownership);
+    
+    FILE *
+    GetInputFileHandle ();
+
+    FILE *
+    GetOutputFileHandle ();
+
+    FILE *
+    GetErrorFileHandle ();
+
+    void
+    SaveInputTerminalState();
+    
+    void
+    RestoreInputTerminalState();
+
+    lldb::SBCommandInterpreter
+    GetCommandInterpreter ();
+
+    void
+    HandleCommand (const char *command);
+
+    lldb::SBListener
+    GetListener ();
+
+    void
+    HandleProcessEvent (const lldb::SBProcess &process,
+                        const lldb::SBEvent &event,
+                        FILE *out,
+                        FILE *err);
+
+    lldb::SBTarget
+    CreateTarget (const char *filename,
+                  const char *target_triple,
+                  const char *platform_name,
+                  bool add_dependent_modules,
+                  lldb::SBError& error);
+
+    lldb::SBTarget
+    CreateTargetWithFileAndTargetTriple (const char *filename,
+                                         const char *target_triple);
+
+    lldb::SBTarget
+    CreateTargetWithFileAndArch (const char *filename,
+                                 const char *archname);
+
+    lldb::SBTarget
+    CreateTarget (const char *filename);
+
+    // Return true if target is deleted from the target list of the debugger.
+    bool
+    DeleteTarget (lldb::SBTarget &target);
+
+    lldb::SBTarget
+    GetTargetAtIndex (uint32_t idx);
+    
+    uint32_t
+    GetIndexOfTarget (lldb::SBTarget target);
+
+    lldb::SBTarget
+    FindTargetWithProcessID (pid_t pid);
+
+    lldb::SBTarget
+    FindTargetWithFileAndArch (const char *filename,
+                               const char *arch);
+
+    uint32_t
+    GetNumTargets ();
+
+    lldb::SBTarget
+    GetSelectedTarget ();
+
+    void
+    SetSelectedTarget (SBTarget& target);
+
+    lldb::SBPlatform
+    GetSelectedPlatform();
+
+    void
+    SetSelectedPlatform(lldb::SBPlatform &platform);
+
+    lldb::SBSourceManager
+    GetSourceManager ();
+
+    // REMOVE: just for a quick fix, need to expose platforms through
+    // SBPlatform from this class.
+    lldb::SBError
+    SetCurrentPlatform (const char *platform_name);
+    
+    bool
+    SetCurrentPlatformSDKRoot (const char *sysroot);
+
+    // FIXME: Once we get the set show stuff in place, the driver won't need
+    // an interface to the Set/Get UseExternalEditor.
+    bool
+    SetUseExternalEditor (bool input);
+    
+    bool 
+    GetUseExternalEditor ();
+
+    bool
+    SetUseColor (bool use_color);
+
+    bool
+    GetUseColor () const;
+
+    static bool
+    GetDefaultArchitecture (char *arch_name, size_t arch_name_len);
+
+    static bool
+    SetDefaultArchitecture (const char *arch_name);
+
+    lldb::ScriptLanguage
+    GetScriptingLanguage (const char *script_language_name);
+
+    static const char *
+    GetVersionString ();
+
+    static const char *
+    StateAsCString (lldb::StateType state);
+
+    static bool
+    StateIsRunningState (lldb::StateType state);
+
+    static bool
+    StateIsStoppedState (lldb::StateType state);
+    
+    bool
+    EnableLog (const char *channel, const char **categories);
+
+    void
+    SetLoggingCallback (lldb::LogOutputCallback log_callback, void *baton);
+    
+    // DEPRECATED
+    void
+    DispatchInput (void* baton,
+                   const void* data,
+                   size_t data_len);
+    
+    void
+    DispatchInput (const void *data, size_t data_len);
+
+    void
+    DispatchInputInterrupt ();
+
+    void
+    DispatchInputEndOfFile ();
+    
+    void
+    PushInputReader (lldb::SBInputReader &reader);
+
+    const char *
+    GetInstanceName  ();
+
+    static SBDebugger
+    FindDebuggerWithID (int id);
+
+    static lldb::SBError
+    SetInternalVariable (const char *var_name, const char *value, const char *debugger_instance_name);
+
+    static lldb::SBStringList
+    GetInternalVariableValue (const char *var_name, const char *debugger_instance_name);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    uint32_t
+    GetTerminalWidth () const;
+
+    void
+    SetTerminalWidth (uint32_t term_width);
+
+    lldb::user_id_t
+    GetID ();
+    
+    const char *
+    GetPrompt() const;
+
+    void
+    SetPrompt (const char *prompt);
+        
+    lldb::ScriptLanguage 
+    GetScriptLanguage() const;
+
+    void
+    SetScriptLanguage (lldb::ScriptLanguage script_lang);
+
+    bool
+    GetCloseInputOnEOF () const;
+    
+    void
+    SetCloseInputOnEOF (bool b);
+
+    SBTypeCategory
+    GetCategory (const char* category_name);
+
+    SBTypeCategory
+    CreateCategory (const char* category_name);
+    
+    bool
+    DeleteCategory (const char* category_name);
+    
+    uint32_t
+    GetNumCategories ();
+    
+    SBTypeCategory
+    GetCategoryAtIndex (uint32_t);
+    
+    SBTypeCategory
+    GetDefaultCategory();
+    
+    SBTypeFormat
+    GetFormatForType (SBTypeNameSpecifier);
+
+#ifndef LLDB_DISABLE_PYTHON
+    SBTypeSummary
+    GetSummaryForType (SBTypeNameSpecifier);
+#endif
+
+    SBTypeFilter
+    GetFilterForType (SBTypeNameSpecifier);
+
+#ifndef LLDB_DISABLE_PYTHON
+    SBTypeSynthetic
+    GetSyntheticForType (SBTypeNameSpecifier);
+#endif
+
+    void
+    RunCommandInterpreter (bool auto_handle_events,
+                           bool spawn_thread);
+
+    void
+    RunCommandInterpreter (bool auto_handle_events,
+                           bool spawn_thread,
+                           SBCommandInterpreterRunOptions &options,
+                           int  &num_errors,
+                           bool &quit_requested,
+                           bool &stopped_for_crash);
+private:
+
+    friend class SBCommandInterpreter;
+    friend class SBInputReader;
+    friend class SBListener;
+    friend class SBProcess;
+    friend class SBSourceManager;
+    friend class SBTarget;
+    
+    lldb::SBTarget
+    FindTargetWithLLDBProcess (const lldb::ProcessSP &processSP);
+
+    void
+    reset (const lldb::DebuggerSP &debugger_sp);
+
+    lldb_private::Debugger *
+    get () const;
+
+    lldb_private::Debugger &
+    ref () const;
+
+    const lldb::DebuggerSP &
+    get_sp () const;
+    
+    lldb::DebuggerSP m_opaque_sp;
+
+}; // class SBDebugger
+
+
+} // namespace lldb
+
+#endif // LLDB_SBDebugger_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h b/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
new file mode 100644
index 000000000000..5461a1f15c2e
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
@@ -0,0 +1,89 @@
+//===-- SBDeclaration.h -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBDeclaration_h_
+#define LLDB_SBDeclaration_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
+
+namespace lldb {
+    
+    class LLDB_API SBDeclaration
+    {
+    public:
+        
+        SBDeclaration ();
+        
+        SBDeclaration (const lldb::SBDeclaration &rhs);
+        
+        ~SBDeclaration ();
+        
+        const lldb::SBDeclaration &
+        operator = (const lldb::SBDeclaration &rhs);
+        
+        bool
+        IsValid () const;
+        
+        lldb::SBFileSpec
+        GetFileSpec () const;
+        
+        uint32_t
+        GetLine () const;
+        
+        uint32_t
+        GetColumn () const;
+        
+        void
+        SetFileSpec (lldb::SBFileSpec filespec);
+        
+        void
+        SetLine (uint32_t line);
+        
+        void
+        SetColumn (uint32_t column);
+        
+        bool
+        operator == (const lldb::SBDeclaration &rhs) const;
+        
+        bool
+        operator != (const lldb::SBDeclaration &rhs) const;
+        
+        bool
+        GetDescription (lldb::SBStream &description);
+        
+    protected:
+        
+        lldb_private::Declaration *
+        get ();
+        
+    private:
+        friend class SBValue;
+        
+        const lldb_private::Declaration *
+        operator->() const;
+        
+        lldb_private::Declaration &
+        ref();
+        
+        const lldb_private::Declaration &
+        ref() const;
+        
+        SBDeclaration (const lldb_private::Declaration *lldb_object_ptr);
+        
+        void
+        SetDeclaration (const lldb_private::Declaration &lldb_object_ref);
+        
+        std::unique_ptr<lldb_private::Declaration> m_opaque_ap;
+    };
+    
+    
+} // namespace lldb
+
+#endif // LLDB_SBDeclaration_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDefines.h b/kcov-38/external/lldb/include/lldb/API/SBDefines.h
new file mode 100644
index 000000000000..09bea502dd01
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBDefines.h
@@ -0,0 +1,101 @@
+//===-- SBDefines.h ---------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBDefines_h_
+#define LLDB_SBDefines_h_
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
+#include "lldb/lldb-versioning.h"
+
+#ifdef SWIG
+#define LLDB_API
+#endif
+
+// Forward Declarations
+namespace lldb {
+
+class LLDB_API SBAddress;
+class LLDB_API SBBlock;
+class LLDB_API SBBreakpoint;
+class LLDB_API SBBreakpointLocation;
+class LLDB_API SBBroadcaster;
+class LLDB_API SBCommand;
+class LLDB_API SBCommandInterpreter;
+class LLDB_API SBCommandInterpreterRunOptions;
+class LLDB_API SBCommandPluginInterface;
+class LLDB_API SBCommandReturnObject;
+class LLDB_API SBCommunication;
+class LLDB_API SBCompileUnit;
+class LLDB_API SBData;
+class LLDB_API SBDebugger;
+class LLDB_API SBDeclaration;
+class LLDB_API SBError;
+class LLDB_API SBEvent;
+class LLDB_API SBEventList;
+class LLDB_API SBExecutionContext;
+class LLDB_API SBExpressionOptions;
+class LLDB_API SBFileSpec;
+class LLDB_API SBFileSpecList;
+class LLDB_API SBFrame;
+class LLDB_API SBFunction;
+class LLDB_API SBHostOS;
+class LLDB_API SBInstruction;
+class LLDB_API SBInstructionList;
+class LLDB_API SBLanguageRuntime;
+class LLDB_API SBLaunchInfo;
+class LLDB_API SBLineEntry;
+class LLDB_API SBListener;
+class LLDB_API SBModule;
+class LLDB_API SBModuleSpec;
+class LLDB_API SBModuleSpecList;
+class LLDB_API SBProcess;
+class LLDB_API SBQueue;
+class LLDB_API SBQueueItem;
+class LLDB_API SBSection;
+class LLDB_API SBSourceManager;
+class LLDB_API SBStream;
+class LLDB_API SBStringList;
+class LLDB_API SBSymbol;
+class LLDB_API SBSymbolContext;
+class LLDB_API SBSymbolContextList;
+class LLDB_API SBTarget;
+class LLDB_API SBThread;
+class LLDB_API SBThreadCollection;
+class LLDB_API SBThreadPlan;
+class LLDB_API SBType;
+class LLDB_API SBTypeCategory;
+class LLDB_API SBTypeEnumMember;
+class LLDB_API SBTypeEnumMemberList;
+class LLDB_API SBTypeFilter;
+class LLDB_API SBTypeFormat;
+class LLDB_API SBTypeMemberFunction;
+class LLDB_API SBTypeNameSpecifier;
+class LLDB_API SBTypeSummary;
+class LLDB_API SBTypeSummaryOptions;
+#ifndef LLDB_DISABLE_PYTHON
+class LLDB_API SBTypeSynthetic;
+#endif
+class LLDB_API SBTypeList;
+class LLDB_API SBValue;
+class LLDB_API SBValueList;
+class LLDB_API SBVariablesOptions;
+class LLDB_API SBWatchpoint;
+class LLDB_API SBUnixSignals;
+
+}
+
+#endif  // LLDB_SBDefines_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBError.h b/kcov-38/external/lldb/include/lldb/API/SBError.h
new file mode 100644
index 000000000000..afdec0d3826d
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBError.h
@@ -0,0 +1,108 @@
+//===-- SBError.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBError_h_
+#define LLDB_SBError_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBError {
+public:
+    SBError ();
+
+    SBError (const lldb::SBError &rhs);
+
+    ~SBError();
+
+    const SBError &
+    operator =(const lldb::SBError &rhs);
+
+    const char *
+    GetCString () const;
+
+    void
+    Clear ();
+
+    bool
+    Fail () const;
+
+    bool
+    Success () const;
+
+    uint32_t
+    GetError () const;
+
+    lldb::ErrorType
+    GetType () const;
+
+    void
+    SetError (uint32_t err, lldb::ErrorType type);
+
+    void
+    SetErrorToErrno ();
+
+    void
+    SetErrorToGenericError ();
+
+    void
+    SetErrorString (const char *err_str);
+
+    int
+    SetErrorStringWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+
+    bool
+    IsValid () const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+protected:
+
+    friend class SBCommandReturnObject;
+    friend class SBData;
+    friend class SBDebugger;
+    friend class SBCommunication;
+    friend class SBHostOS;
+    friend class SBPlatform;
+    friend class SBProcess;
+    friend class SBThread;
+    friend class SBTarget;
+    friend class SBValue;
+    friend class SBWatchpoint;
+    friend class SBBreakpoint;
+    friend class SBBreakpointLocation;
+
+    lldb_private::Error *
+    get();
+
+    lldb_private::Error *
+    operator->();
+
+    const lldb_private::Error &
+    operator*() const;
+
+    lldb_private::Error &
+    ref();
+
+    void
+    SetError (const lldb_private::Error &lldb_error);
+
+private:
+    std::unique_ptr<lldb_private::Error> m_opaque_ap;
+
+    void
+    CreateIfNeeded ();
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBError_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBEvent.h b/kcov-38/external/lldb/include/lldb/API/SBEvent.h
new file mode 100644
index 000000000000..975c365f5916
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBEvent.h
@@ -0,0 +1,105 @@
+//===-- SBEvent.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBEvent_h_
+#define LLDB_SBEvent_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+#include <vector>
+
+
+namespace lldb {
+
+class SBBroadcaster;
+
+class LLDB_API SBEvent
+{
+public:
+    SBEvent();
+
+    SBEvent (const lldb::SBEvent &rhs);
+    
+    // Make an event that contains a C string.
+    SBEvent (uint32_t event, const char *cstr, uint32_t cstr_len);
+
+    SBEvent (lldb::EventSP &event_sp);
+
+    SBEvent (lldb_private::Event *event_sp);
+
+    ~SBEvent();
+
+    const SBEvent &
+    operator = (const lldb::SBEvent &rhs);
+
+    bool
+    IsValid() const;
+
+    const char *
+    GetDataFlavor ();
+
+    uint32_t
+    GetType () const;
+
+    lldb::SBBroadcaster
+    GetBroadcaster () const;
+
+    const char *
+    GetBroadcasterClass () const;
+
+    bool
+    BroadcasterMatchesPtr (const lldb::SBBroadcaster *broadcaster);
+
+    bool
+    BroadcasterMatchesRef (const lldb::SBBroadcaster &broadcaster);
+
+    void
+    Clear();
+
+    static const char *
+    GetCStringFromEvent (const lldb::SBEvent &event);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
+protected:
+    friend class SBListener;
+    friend class SBBroadcaster;
+    friend class SBBreakpoint;
+    friend class SBDebugger;
+    friend class SBProcess;
+    friend class SBTarget;
+    friend class SBThread;
+    friend class SBWatchpoint;
+
+    lldb::EventSP &
+    GetSP () const;
+
+    void
+    reset (lldb::EventSP &event_sp);
+
+    void
+    reset (lldb_private::Event* event);
+
+    lldb_private::Event *
+    get () const;
+
+private:
+
+    mutable lldb::EventSP m_event_sp;
+    mutable lldb_private::Event *m_opaque_ptr;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBEvent_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h b/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
new file mode 100644
index 000000000000..1d64497ae867
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
@@ -0,0 +1,74 @@
+//===-- SBExecutionContext.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBExecutionContext_h_
+#define LLDB_SBExecutionContext_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+#include <vector>
+
+
+namespace lldb {
+    
+class LLDB_API SBExecutionContext
+{
+friend class SBCommandInterpreter;
+
+public:
+    SBExecutionContext();
+    
+    SBExecutionContext (const lldb::SBExecutionContext &rhs);
+    
+    SBExecutionContext (lldb::ExecutionContextRefSP exe_ctx_ref_sp);
+    
+    SBExecutionContext (const lldb::SBTarget &target);
+    
+    SBExecutionContext (const lldb::SBProcess &process);
+    
+    SBExecutionContext (lldb::SBThread thread); // can't be a const& because SBThread::get() isn't itself a const function
+    
+    SBExecutionContext (const lldb::SBFrame &frame);
+    
+    ~SBExecutionContext();
+    
+    const SBExecutionContext &
+    operator = (const lldb::SBExecutionContext &rhs);
+    
+    SBTarget
+    GetTarget () const;
+    
+    SBProcess
+    GetProcess () const;
+
+    SBThread
+    GetThread () const;
+
+    SBFrame
+    GetFrame () const;
+    
+protected:
+    ExecutionContextRefSP &
+    GetSP () const;
+    
+    void
+    reset (lldb::ExecutionContextRefSP &event_sp);
+    
+    lldb_private::ExecutionContextRef *
+    get () const;
+    
+private:
+    
+    mutable lldb::ExecutionContextRefSP m_exe_ctx_sp;
+};
+    
+} // namespace lldb
+
+#endif  // LLDB_SBExecutionContext_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h b/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
new file mode 100644
index 000000000000..ed2f9187b3e0
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
@@ -0,0 +1,135 @@
+//===-- SBEvent.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBExpressionOptions_h_
+#define LLDB_SBExpressionOptions_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <vector>
+
+namespace lldb {
+
+
+class LLDB_API SBExpressionOptions
+{
+public:
+    SBExpressionOptions();
+
+    SBExpressionOptions (const lldb::SBExpressionOptions &rhs);
+    
+    ~SBExpressionOptions();
+
+    const SBExpressionOptions &
+    operator = (const lldb::SBExpressionOptions &rhs);
+
+    bool
+    GetCoerceResultToId () const;
+    
+    void
+    SetCoerceResultToId (bool coerce = true);
+    
+    bool
+    GetUnwindOnError () const;
+    
+    void
+    SetUnwindOnError (bool unwind = true);
+    
+    bool
+    GetIgnoreBreakpoints () const;
+    
+    void
+    SetIgnoreBreakpoints (bool ignore = true);
+    
+    lldb::DynamicValueType
+    GetFetchDynamicValue () const;
+    
+    void
+    SetFetchDynamicValue (lldb::DynamicValueType dynamic = lldb::eDynamicCanRunTarget);
+    
+    uint32_t
+    GetTimeoutInMicroSeconds () const;
+    
+    // Set the timeout for the expression, 0 means wait forever.
+    void
+    SetTimeoutInMicroSeconds (uint32_t timeout = 0);
+    
+    uint32_t
+    GetOneThreadTimeoutInMicroSeconds () const;
+    
+    // Set the timeout for running on one thread, 0 means use the default behavior.
+    // If you set this higher than the overall timeout, you'll get an error when you
+    // try to run the expression.
+    void
+    SetOneThreadTimeoutInMicroSeconds (uint32_t timeout = 0);
+    
+    bool
+    GetTryAllThreads () const;
+    
+    void
+    SetTryAllThreads (bool run_others = true);
+    
+    bool
+    GetStopOthers() const;
+    
+    void
+    SetStopOthers(bool stop_others = true);
+
+    bool
+    GetTrapExceptions () const;
+    
+    void
+    SetTrapExceptions (bool trap_exceptions = true);
+    
+    void
+    SetLanguage (lldb::LanguageType language);
+
+    void
+    SetCancelCallback (lldb::ExpressionCancelCallback callback, void *baton);
+
+    bool
+    GetGenerateDebugInfo ();
+    
+    void
+    SetGenerateDebugInfo (bool b = true);
+    
+    bool
+    GetSuppressPersistentResult ();
+    
+    void
+    SetSuppressPersistentResult (bool b = false);
+
+    const char *
+    GetPrefix () const;
+
+    void
+    SetPrefix (const char *prefix);
+
+protected:
+
+    SBExpressionOptions (lldb_private::EvaluateExpressionOptions &expression_options);
+
+    lldb_private::EvaluateExpressionOptions *
+    get () const;
+
+    lldb_private::EvaluateExpressionOptions &
+    ref () const;
+
+    friend class SBFrame;
+    friend class SBValue;
+    friend class SBTarget;
+
+private:
+    // This auto_pointer is made in the constructor and is always valid.
+    mutable std::unique_ptr<lldb_private::EvaluateExpressionOptions> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBExpressionOptions_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h b/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
new file mode 100644
index 000000000000..d6f38f5b2d74
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
@@ -0,0 +1,104 @@
+//===-- SBFileSpec.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBFileSpec_h_
+#define LLDB_SBFileSpec_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBFileSpec
+{
+public:
+    SBFileSpec ();
+
+    SBFileSpec (const lldb::SBFileSpec &rhs);
+
+    SBFileSpec (const char *path);// Deprecated, use SBFileSpec (const char *path, bool resolve)
+
+    SBFileSpec (const char *path, bool resolve);
+
+    ~SBFileSpec ();
+
+    const SBFileSpec &
+    operator = (const lldb::SBFileSpec &rhs);
+
+    bool
+    IsValid() const;
+
+    bool
+    Exists () const;
+
+    bool
+    ResolveExecutableLocation ();
+
+    const char *
+    GetFilename() const;
+
+    const char *
+    GetDirectory() const;
+
+    void
+    SetFilename(const char *filename);
+    
+    void
+    SetDirectory(const char *directory);
+
+    uint32_t
+    GetPath (char *dst_path, size_t dst_len) const;
+
+    static int
+    ResolvePath (const char *src_path, char *dst_path, size_t dst_len);
+
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
+private:
+    friend class SBAttachInfo;
+    friend class SBBlock;
+    friend class SBCommandInterpreter;
+    friend class SBCompileUnit;
+    friend class SBDeclaration;
+    friend class SBFileSpecList;
+    friend class SBHostOS;
+    friend class SBLaunchInfo;
+    friend class SBLineEntry;
+    friend class SBModule;
+    friend class SBModuleSpec;
+    friend class SBPlatform;
+    friend class SBProcess;
+    friend class SBSourceManager;
+    friend class SBThread;
+    friend class SBTarget;
+
+    SBFileSpec (const lldb_private::FileSpec& fspec);
+
+    void
+    SetFileSpec (const lldb_private::FileSpec& fspec);
+
+    const lldb_private::FileSpec *
+    operator->() const;
+
+    const lldb_private::FileSpec *
+    get() const;
+
+    const lldb_private::FileSpec &
+    operator*() const;
+
+    const lldb_private::FileSpec &
+    ref() const;
+
+    std::unique_ptr<lldb_private::FileSpec> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBFileSpec_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h b/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
new file mode 100644
index 000000000000..ff429a1815be
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
@@ -0,0 +1,72 @@
+//===-- SBFileSpecList.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBFileSpecList_h_
+#define LLDB_SBFileSpecList_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBFileSpecList
+{
+public:
+    SBFileSpecList ();
+
+    SBFileSpecList (const lldb::SBFileSpecList &rhs);
+
+    ~SBFileSpecList ();
+
+    const SBFileSpecList &
+    operator = (const lldb::SBFileSpecList &rhs);
+
+    uint32_t
+    GetSize () const;
+
+    bool
+    GetDescription (SBStream &description) const;
+    
+    void
+    Append (const SBFileSpec &sb_file);
+    
+    bool
+    AppendIfUnique (const SBFileSpec &sb_file);
+    
+    void
+    Clear();
+    
+    uint32_t
+    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full);
+    
+    const SBFileSpec
+    GetFileSpecAtIndex (uint32_t idx) const;
+
+private:
+
+friend class SBTarget;
+
+    const lldb_private::FileSpecList *
+    operator->() const;
+
+    const lldb_private::FileSpecList *
+    get() const;
+
+    const lldb_private::FileSpecList &
+    operator*() const;
+
+    const lldb_private::FileSpecList &
+    ref() const;
+
+    std::unique_ptr<lldb_private::FileSpecList> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBFileSpecList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFrame.h b/kcov-38/external/lldb/include/lldb/API/SBFrame.h
new file mode 100644
index 000000000000..2ca9e062490d
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBFrame.h
@@ -0,0 +1,237 @@
+//===-- SBFrame.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBFrame_h_
+#define LLDB_SBFrame_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBValueList.h"
+
+namespace lldb {
+
+class LLDB_API SBFrame
+{
+public:
+    SBFrame ();
+
+    SBFrame (const lldb::SBFrame &rhs);
+    
+    const lldb::SBFrame &
+    operator =(const lldb::SBFrame &rhs);
+
+    ~SBFrame();
+
+    bool
+    IsEqual (const lldb::SBFrame &that) const;
+
+    bool
+    IsValid() const;
+
+    uint32_t
+    GetFrameID () const;
+
+    lldb::addr_t
+    GetCFA () const;
+
+    lldb::addr_t
+    GetPC () const;
+
+    bool
+    SetPC (lldb::addr_t new_pc);
+
+    lldb::addr_t
+    GetSP () const;
+
+    lldb::addr_t
+    GetFP () const;
+
+    lldb::SBAddress
+    GetPCAddress () const;
+
+    lldb::SBSymbolContext
+    GetSymbolContext (uint32_t resolve_scope) const;
+
+    lldb::SBModule
+    GetModule () const;
+
+    lldb::SBCompileUnit
+    GetCompileUnit () const;
+
+    lldb::SBFunction
+    GetFunction () const;
+
+    lldb::SBSymbol
+    GetSymbol () const;
+
+    /// Gets the deepest block that contains the frame PC.
+    ///
+    /// See also GetFrameBlock().
+    lldb::SBBlock
+    GetBlock () const;
+
+    /// Get the appropriate function name for this frame. Inlined functions in
+    /// LLDB are represented by Blocks that have inlined function information, so
+    /// just looking at the SBFunction or SBSymbol for a frame isn't enough.
+    /// This function will return the appropriate function, symbol or inlined
+    /// function name for the frame.
+    ///
+    /// This function returns:
+    /// - the name of the inlined function (if there is one)
+    /// - the name of the concrete function (if there is one)
+    /// - the name of the symbol (if there is one)
+    /// - NULL
+    ///
+    /// See also IsInlined().
+    const char *
+    GetFunctionName();
+
+    const char *
+    GetFunctionName() const;
+
+    /// Return true if this frame represents an inlined function.
+    ///
+    /// See also GetFunctionName().
+    bool
+    IsInlined();
+
+    bool
+    IsInlined() const;
+
+    /// The version that doesn't supply a 'use_dynamic' value will use the
+    /// target's default.
+    lldb::SBValue
+    EvaluateExpression (const char *expr);    
+
+    lldb::SBValue
+    EvaluateExpression (const char *expr, lldb::DynamicValueType use_dynamic);
+
+    lldb::SBValue
+    EvaluateExpression (const char *expr, lldb::DynamicValueType use_dynamic, bool unwind_on_error);
+    
+    lldb::SBValue
+    EvaluateExpression (const char *expr, const SBExpressionOptions &options);
+
+    /// Gets the lexical block that defines the stack frame. Another way to think
+    /// of this is it will return the block that contains all of the variables
+    /// for a stack frame. Inlined functions are represented as SBBlock objects
+    /// that have inlined function information: the name of the inlined function,
+    /// where it was called from. The block that is returned will be the first 
+    /// block at or above the block for the PC (SBFrame::GetBlock()) that defines
+    /// the scope of the frame. When a function contains no inlined functions,
+    /// this will be the top most lexical block that defines the function. 
+    /// When a function has inlined functions and the PC is currently
+    /// in one of those inlined functions, this method will return the inlined
+    /// block that defines this frame. If the PC isn't currently in an inlined
+    /// function, the lexical block that defines the function is returned.
+    lldb::SBBlock
+    GetFrameBlock () const;
+
+    lldb::SBLineEntry
+    GetLineEntry () const;
+
+    lldb::SBThread
+    GetThread () const;
+
+    const char *
+    Disassemble () const;
+
+    void
+    Clear();
+
+    bool
+    operator == (const lldb::SBFrame &rhs) const;
+
+    bool
+    operator != (const lldb::SBFrame &rhs) const;
+
+    /// The version that doesn't supply a 'use_dynamic' value will use the
+    /// target's default.
+    lldb::SBValueList
+    GetVariables (bool arguments,
+                  bool locals,
+                  bool statics,
+                  bool in_scope_only);
+
+    lldb::SBValueList
+    GetVariables (bool arguments,
+                  bool locals,
+                  bool statics,
+                  bool in_scope_only,
+                  lldb::DynamicValueType  use_dynamic);
+
+    lldb::SBValueList
+    GetVariables (const lldb::SBVariablesOptions& options);
+    
+    lldb::SBValueList
+    GetRegisters ();
+
+    lldb::SBValue
+    FindRegister (const char *name);
+
+    /// The version that doesn't supply a 'use_dynamic' value will use the
+    /// target's default.
+    lldb::SBValue
+    FindVariable (const char *var_name);
+
+    lldb::SBValue
+    FindVariable (const char *var_name, lldb::DynamicValueType use_dynamic);
+
+    // Find a value for a variable expression path like "rect.origin.x" or
+    // "pt_ptr->x", "*self", "*this->obj_ptr". The returned value is _not_
+    // and expression result and is not a constant object like 
+    // SBFrame::EvaluateExpression(...) returns, but a child object of 
+    // the variable value.
+    lldb::SBValue
+    GetValueForVariablePath (const char *var_expr_cstr, 
+                             DynamicValueType use_dynamic);
+
+    /// The version that doesn't supply a 'use_dynamic' value will use the
+    /// target's default.
+    lldb::SBValue
+    GetValueForVariablePath (const char *var_path);
+
+    /// Find variables, register sets, registers, or persistent variables using
+    /// the frame as the scope.
+    ///
+    /// NB. This function does not look up ivars in the function object pointer.
+    /// To do that use GetValueForVariablePath.
+    ///
+    /// The version that doesn't supply a 'use_dynamic' value will use the
+    /// target's default.
+    lldb::SBValue
+    FindValue (const char *name, ValueType value_type);
+
+    lldb::SBValue
+    FindValue (const char *name, ValueType value_type, lldb::DynamicValueType use_dynamic);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    SBFrame (const lldb::StackFrameSP &lldb_object_sp);
+
+protected:
+
+    friend class SBBlock;
+    friend class SBExecutionContext;
+    friend class SBInstruction;
+    friend class SBThread;
+    friend class SBValue;
+
+    lldb::StackFrameSP
+    GetFrameSP() const;
+
+    void
+    SetFrameSP (const lldb::StackFrameSP &lldb_object_sp);
+
+    lldb::ExecutionContextRefSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBFrame_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFunction.h b/kcov-38/external/lldb/include/lldb/API/SBFunction.h
new file mode 100644
index 000000000000..7d578393eb2c
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBFunction.h
@@ -0,0 +1,96 @@
+//===-- SBFunction.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBFunction_h_
+#define LLDB_SBFunction_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBInstructionList.h"
+
+namespace lldb {
+
+class LLDB_API SBFunction
+{
+public:
+
+    SBFunction ();
+
+    SBFunction (const lldb::SBFunction &rhs);
+
+    const lldb::SBFunction &
+    operator = (const lldb::SBFunction &rhs);
+
+    ~SBFunction ();
+
+    bool
+    IsValid () const;
+
+    const char *
+    GetName() const;
+
+    const char *
+    GetMangledName () const;
+
+    lldb::SBInstructionList
+    GetInstructions (lldb::SBTarget target);
+
+    lldb::SBInstructionList
+    GetInstructions (lldb::SBTarget target, const char *flavor);
+
+    lldb::SBAddress
+    GetStartAddress ();
+
+    lldb::SBAddress
+    GetEndAddress ();
+
+    uint32_t
+    GetPrologueByteSize ();
+
+    lldb::SBType
+    GetType ();
+
+    lldb::SBBlock
+    GetBlock ();
+    
+    lldb::LanguageType
+    GetLanguage ();
+
+    bool
+    operator == (const lldb::SBFunction &rhs) const;
+
+    bool
+    operator != (const lldb::SBFunction &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+protected:
+
+    lldb_private::Function *
+    get ();
+
+    void
+    reset (lldb_private::Function *lldb_object_ptr);
+
+private:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBSymbolContext;
+
+    SBFunction (lldb_private::Function *lldb_object_ptr);
+
+
+    lldb_private::Function *m_opaque_ptr;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBFunction_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBHostOS.h b/kcov-38/external/lldb/include/lldb/API/SBHostOS.h
new file mode 100644
index 000000000000..d9bc97365632
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBHostOS.h
@@ -0,0 +1,60 @@
+//===-- SBHostOS.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBHostOS_h_
+#define LLDB_SBHostOS_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
+
+namespace lldb {
+
+class LLDB_API SBHostOS
+{
+public:
+
+    static lldb::SBFileSpec
+    GetProgramFileSpec ();
+    
+    static lldb::SBFileSpec
+    GetLLDBPythonPath ();
+
+    static lldb::SBFileSpec
+    GetLLDBPath (lldb::PathType path_type);
+
+    static void
+    ThreadCreated (const char *name);
+
+    static lldb::thread_t
+    ThreadCreate (const char *name,
+                  lldb::thread_func_t thread_function,
+                  void *thread_arg,
+                  lldb::SBError *err);
+
+    static bool
+    ThreadCancel (lldb::thread_t thread,
+                  lldb::SBError *err);
+
+    static bool
+    ThreadDetach (lldb::thread_t thread,
+                  lldb::SBError *err);
+    static bool
+    ThreadJoin (lldb::thread_t thread,
+                lldb::thread_result_t *result,
+                lldb::SBError *err);
+
+
+private:
+
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBHostOS_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBInstruction.h b/kcov-38/external/lldb/include/lldb/API/SBInstruction.h
new file mode 100644
index 000000000000..c4bded595761
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBInstruction.h
@@ -0,0 +1,94 @@
+//===-- SBInstruction.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBInstruction_h_
+#define LLDB_SBInstruction_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBData.h"
+
+#include <stdio.h>
+
+// There's a lot to be fixed here, but need to wait for underlying insn implementation
+// to be revised & settle down first.
+
+namespace lldb {
+
+class LLDB_API SBInstruction
+{
+public:
+
+    SBInstruction ();
+
+    SBInstruction (const SBInstruction &rhs);
+    
+    const SBInstruction &
+    operator = (const SBInstruction &rhs);
+
+    ~SBInstruction ();
+
+    bool
+    IsValid();
+
+    SBAddress
+    GetAddress();
+    
+    lldb::AddressClass
+    GetAddressClass ();
+    
+    const char *
+    GetMnemonic (lldb::SBTarget target);
+
+    const char *
+    GetOperands (lldb::SBTarget target);
+    
+    const char *
+    GetComment (lldb::SBTarget target);
+
+    lldb::SBData
+    GetData (lldb::SBTarget target);
+
+    size_t
+    GetByteSize ();
+
+    bool
+    DoesBranch ();
+
+    void
+    Print (FILE *out);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    bool
+    EmulateWithFrame (lldb::SBFrame &frame, uint32_t evaluate_options);
+
+    bool
+    DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'armv7-apple-ios'
+    
+    bool
+    TestEmulation (lldb::SBStream &output_stream, const char *test_file);
+
+protected:
+    friend class SBInstructionList;
+
+    SBInstruction (const lldb::InstructionSP &inst_sp);
+
+    void
+    SetOpaque (const lldb::InstructionSP &inst_sp);
+
+private:
+
+    lldb::InstructionSP  m_opaque_sp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBInstruction_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h b/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
new file mode 100644
index 000000000000..8ef163796629
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
@@ -0,0 +1,71 @@
+//===-- SBInstructionList.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBInstructionList_h_
+#define LLDB_SBInstructionList_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+
+namespace lldb {
+
+class LLDB_API SBInstructionList
+{
+public:
+
+    SBInstructionList ();
+
+    SBInstructionList (const SBInstructionList &rhs);
+    
+    const SBInstructionList &
+    operator = (const SBInstructionList &rhs);
+
+    ~SBInstructionList ();
+
+    bool
+    IsValid () const;
+
+    size_t
+    GetSize ();
+
+    lldb::SBInstruction
+    GetInstructionAtIndex (uint32_t idx);
+
+    void
+    Clear ();
+
+    void
+    AppendInstruction (lldb::SBInstruction inst);
+
+    void
+    Print (FILE *out);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+    
+    bool
+    DumpEmulationForAllInstructions (const char *triple);
+
+protected:
+    friend class SBFunction;
+    friend class SBSymbol;
+    friend class SBTarget;
+    
+    void
+    SetDisassembler (const lldb::DisassemblerSP &opaque_sp);
+
+private:    
+    lldb::DisassemblerSP m_opaque_sp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBInstructionList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h b/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
new file mode 100644
index 000000000000..898604c496fa
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
@@ -0,0 +1,29 @@
+//===-- SBLanguageRuntime.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBLanguageRuntime_h_
+#define LLDB_SBLanguageRuntime_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class SBLanguageRuntime
+{
+public:
+    static lldb::LanguageType
+    GetLanguageTypeFromString (const char *string);
+    
+    static const char *
+    GetNameForLanguageType (lldb::LanguageType language);
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBLanguageRuntime_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h b/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
new file mode 100644
index 000000000000..68c0f386acde
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
@@ -0,0 +1,195 @@
+//===-- SBLaunchInfo.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBLaunchInfo_h_
+#define LLDB_SBLaunchInfo_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class SBPlatform;
+class SBTarget;
+
+class LLDB_API SBLaunchInfo
+{
+public:
+    SBLaunchInfo (const char **argv);
+
+    ~SBLaunchInfo();
+
+    lldb::pid_t
+    GetProcessID();
+
+    uint32_t
+    GetUserID();
+
+    uint32_t
+    GetGroupID();
+
+    bool
+    UserIDIsValid ();
+
+    bool
+    GroupIDIsValid ();
+
+    void
+    SetUserID (uint32_t uid);
+
+    void
+    SetGroupID (uint32_t gid);
+
+    SBFileSpec
+    GetExecutableFile ();
+
+    //----------------------------------------------------------------------
+    /// Set the executable file that will be used to launch the process and
+    /// optionally set it as the first argument in the argument vector.
+    ///
+    /// This only needs to be specified if clients wish to carefully control
+    /// the exact path will be used to launch a binary. If you create a
+    /// target with a symlink, that symlink will get resolved in the target
+    /// and the resolved path will get used to launch the process. Calling
+    /// this function can help you still launch your process using the
+    /// path of your choice.
+    ///
+    /// If this function is not called prior to launching with
+    /// SBTarget::Launch(...), the target will use the resolved executable
+    /// path that was used to create the target.
+    ///
+    /// @param[in] exe_file
+    ///     The override path to use when launching the executable.
+    ///
+    /// @param[in] add_as_first_arg
+    ///     If true, then the path will be inserted into the argument vector
+    ///     prior to launching. Otherwise the argument vector will be left
+    ///     alone.
+    //----------------------------------------------------------------------
+    void
+    SetExecutableFile (SBFileSpec exe_file, bool add_as_first_arg);
+
+
+    //----------------------------------------------------------------------
+    /// Get the listener that will be used to receive process events.
+    ///
+    /// If no listener has been set via a call to
+    /// SBLaunchInfo::SetListener(), then an invalid SBListener will be
+    /// returned (SBListener::IsValid() will return false). If a listener
+    /// has been set, then the valid listener object will be returned.
+    //----------------------------------------------------------------------
+    SBListener
+    GetListener ();
+
+    //----------------------------------------------------------------------
+    /// Set the listener that will be used to receive process events.
+    ///
+    /// By default the SBDebugger, which has a listener, that the SBTarget
+    /// belongs to will listen for the process events. Calling this function
+    /// allows a different listener to be used to listen for process events.
+    //----------------------------------------------------------------------
+    void
+    SetListener (SBListener &listener);
+
+    uint32_t
+    GetNumArguments ();
+
+    const char *
+    GetArgumentAtIndex (uint32_t idx);
+
+    void
+    SetArguments (const char **argv, bool append);
+
+    uint32_t
+    GetNumEnvironmentEntries ();
+
+    const char *
+    GetEnvironmentEntryAtIndex (uint32_t idx);
+
+    void
+    SetEnvironmentEntries (const char **envp, bool append);
+
+    void
+    Clear ();
+
+    const char *
+    GetWorkingDirectory () const;
+
+    void
+    SetWorkingDirectory (const char *working_dir);
+
+    uint32_t
+    GetLaunchFlags ();
+
+    void
+    SetLaunchFlags (uint32_t flags);
+
+    const char *
+    GetProcessPluginName ();
+
+    void
+    SetProcessPluginName (const char *plugin_name);
+
+    const char *
+    GetShell ();
+
+    void
+    SetShell (const char * path);
+    
+    bool
+    GetShellExpandArguments ();
+    
+    void
+    SetShellExpandArguments (bool glob);
+    
+    uint32_t
+    GetResumeCount ();
+
+    void
+    SetResumeCount (uint32_t c);
+
+    bool
+    AddCloseFileAction (int fd);
+
+    bool
+    AddDuplicateFileAction (int fd, int dup_fd);
+
+    bool
+    AddOpenFileAction (int fd, const char *path, bool read, bool write);
+
+    bool
+    AddSuppressFileAction (int fd, bool read, bool write);
+
+    void
+    SetLaunchEventData (const char *data);
+
+    const char *
+    GetLaunchEventData () const;
+
+    bool
+    GetDetachOnError() const;
+
+    void
+    SetDetachOnError(bool enable);
+
+protected:
+    friend class SBPlatform;
+    friend class SBTarget;
+
+    lldb_private::ProcessLaunchInfo &
+    ref ();
+
+    const lldb_private::ProcessLaunchInfo &
+    ref () const;
+
+    ProcessLaunchInfoSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBLaunchInfo_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h b/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
new file mode 100644
index 000000000000..8311bbbafc90
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
@@ -0,0 +1,99 @@
+//===-- SBLineEntry.h -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBLineEntry_h_
+#define LLDB_SBLineEntry_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBFileSpec.h"
+
+namespace lldb {
+
+class LLDB_API SBLineEntry
+{
+public:
+
+    SBLineEntry ();
+
+    SBLineEntry (const lldb::SBLineEntry &rhs);
+
+    ~SBLineEntry ();
+
+    const lldb::SBLineEntry &
+    operator = (const lldb::SBLineEntry &rhs);
+
+    lldb::SBAddress
+    GetStartAddress () const;
+
+    lldb::SBAddress
+    GetEndAddress () const;
+
+    bool
+    IsValid () const;
+
+    lldb::SBFileSpec
+    GetFileSpec () const;
+
+    uint32_t
+    GetLine () const;
+
+    uint32_t
+    GetColumn () const;
+
+    void
+    SetFileSpec (lldb::SBFileSpec filespec);
+    
+    void
+    SetLine (uint32_t line);
+    
+    void
+    SetColumn (uint32_t column);
+
+    bool
+    operator == (const lldb::SBLineEntry &rhs) const;
+
+    bool
+    operator != (const lldb::SBLineEntry &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+protected:
+
+    lldb_private::LineEntry *
+    get ();
+    
+private:
+    friend class SBAddress;
+    friend class SBCompileUnit;
+    friend class SBFrame;
+    friend class SBSymbolContext;
+
+    const lldb_private::LineEntry *
+    operator->() const;
+
+    lldb_private::LineEntry &
+    ref();
+
+    const lldb_private::LineEntry &
+    ref() const;
+
+    SBLineEntry (const lldb_private::LineEntry *lldb_object_ptr);
+
+    void
+    SetLineEntry (const lldb_private::LineEntry &lldb_object_ref);
+
+    std::unique_ptr<lldb_private::LineEntry> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBLineEntry_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBListener.h b/kcov-38/external/lldb/include/lldb/API/SBListener.h
new file mode 100644
index 000000000000..924f8109f638
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBListener.h
@@ -0,0 +1,145 @@
+//===-- SBListener.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBListener_h_
+#define LLDB_SBListener_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBListener
+{
+public:
+    SBListener ();
+
+    SBListener (const char *name);
+
+    SBListener (const SBListener &rhs);
+
+    ~SBListener ();
+
+    const lldb::SBListener &
+    operator = (const lldb::SBListener &rhs);
+
+    void
+    AddEvent (const lldb::SBEvent &event);
+
+    void
+    Clear ();
+
+    bool
+    IsValid () const;
+
+    uint32_t
+    StartListeningForEventClass (SBDebugger &debugger,
+                                 const char *broadcaster_class, 
+                                 uint32_t event_mask);
+                                 
+    bool
+    StopListeningForEventClass (SBDebugger &debugger,
+                                const char *broadcaster_class,
+                                uint32_t event_mask);
+    
+    uint32_t
+    StartListeningForEvents (const lldb::SBBroadcaster& broadcaster,
+                             uint32_t event_mask);
+
+    bool
+    StopListeningForEvents (const lldb::SBBroadcaster& broadcaster,
+                            uint32_t event_mask);
+
+    // Returns true if an event was received, false if we timed out.
+    bool
+    WaitForEvent (uint32_t num_seconds,
+                  lldb::SBEvent &event);
+
+    bool
+    WaitForEventForBroadcaster (uint32_t num_seconds,
+                                const lldb::SBBroadcaster &broadcaster,
+                                lldb::SBEvent &sb_event);
+
+    bool
+    WaitForEventForBroadcasterWithType (uint32_t num_seconds,
+                                        const lldb::SBBroadcaster &broadcaster,
+                                        uint32_t event_type_mask,
+                                        lldb::SBEvent &sb_event);
+
+    bool
+    PeekAtNextEvent (lldb::SBEvent &sb_event);
+
+    bool
+    PeekAtNextEventForBroadcaster (const lldb::SBBroadcaster &broadcaster,
+                                   lldb::SBEvent &sb_event);
+
+    bool
+    PeekAtNextEventForBroadcasterWithType (const lldb::SBBroadcaster &broadcaster,
+                                           uint32_t event_type_mask,
+                                           lldb::SBEvent &sb_event);
+
+    bool
+    GetNextEvent (lldb::SBEvent &sb_event);
+
+    bool
+    GetNextEventForBroadcaster (const lldb::SBBroadcaster &broadcaster,
+                                lldb::SBEvent &sb_event);
+
+    bool
+    GetNextEventForBroadcasterWithType (const lldb::SBBroadcaster &broadcaster,
+                                        uint32_t event_type_mask,
+                                        lldb::SBEvent &sb_event);
+
+    bool
+    HandleBroadcastEvent (const lldb::SBEvent &event);
+
+protected:
+    friend class SBAttachInfo;
+    friend class SBBroadcaster;
+    friend class SBCommandInterpreter;
+    friend class SBDebugger;
+    friend class SBLaunchInfo;
+    friend class SBTarget;
+
+    SBListener (lldb_private::Listener &listener);
+
+    SBListener (const lldb::ListenerSP &listener_sp);
+
+    lldb::ListenerSP
+    GetSP ()
+    {
+        return m_opaque_sp;
+    }
+
+private:
+
+    lldb_private::Listener *
+    operator->() const;
+
+    lldb_private::Listener *
+    get() const;
+
+    lldb_private::Listener &
+    ref() const;
+        
+    lldb_private::Listener &
+    operator *();
+
+    const lldb_private::Listener &
+    operator *() const;
+
+    void
+    reset(lldb_private::Listener *listener, bool transfer_ownership);
+
+    lldb::ListenerSP m_opaque_sp;
+    lldb_private::Listener *m_opaque_ptr;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBListener_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBModule.h b/kcov-38/external/lldb/include/lldb/API/SBModule.h
new file mode 100644
index 000000000000..4030d2b21797
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBModule.h
@@ -0,0 +1,359 @@
+//===-- SBModule.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBModule_h_
+#define LLDB_SBModule_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBSection.h"
+#include "lldb/API/SBSymbolContext.h"
+#include "lldb/API/SBValueList.h"
+
+namespace lldb {
+
+class LLDB_API SBModule
+{
+public:
+
+    SBModule ();
+
+    SBModule (const SBModule &rhs);
+
+    SBModule (const SBModuleSpec &module_spec);
+
+    const SBModule &
+    operator = (const SBModule &rhs);
+
+    SBModule (lldb::SBProcess &process, 
+              lldb::addr_t header_addr);
+
+    ~SBModule ();
+
+    bool
+    IsValid () const;
+
+    void
+    Clear();
+
+    //------------------------------------------------------------------
+    /// Get const accessor for the module file specification.
+    ///
+    /// This function returns the file for the module on the host system
+    /// that is running LLDB. This can differ from the path on the 
+    /// platform since we might be doing remote debugging.
+    ///
+    /// @return
+    ///     A const reference to the file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetFileSpec () const;
+
+    //------------------------------------------------------------------
+    /// Get accessor for the module platform file specification.
+    ///
+    /// Platform file refers to the path of the module as it is known on
+    /// the remote system on which it is being debugged. For local 
+    /// debugging this is always the same as Module::GetFileSpec(). But
+    /// remote debugging might mention a file '/usr/lib/liba.dylib'
+    /// which might be locally downloaded and cached. In this case the
+    /// platform file could be something like:
+    /// '/tmp/lldb/platform-cache/remote.host.computer/usr/lib/liba.dylib'
+    /// The file could also be cached in a local developer kit directory.
+    ///
+    /// @return
+    ///     A const reference to the file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetPlatformFileSpec () const;
+
+    bool
+    SetPlatformFileSpec (const lldb::SBFileSpec &platform_file);
+
+    //------------------------------------------------------------------
+    /// Get accessor for the remote install path for a module.
+    ///
+    /// When debugging to a remote platform by connecting to a remote
+    /// platform, the install path of the module can be set. If the
+    /// install path is set, every time the process is about to launch
+    /// the target will install this module on the remote platform prior
+    /// to launching.
+    ///
+    /// @return
+    ///     A file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetRemoteInstallFileSpec ();
+    
+    //------------------------------------------------------------------
+    /// Set accessor for the remote install path for a module.
+    ///
+    /// When debugging to a remote platform by connecting to a remote
+    /// platform, the install path of the module can be set. If the
+    /// install path is set, every time the process is about to launch
+    /// the target will install this module on the remote platform prior
+    /// to launching.
+    ///
+    /// If \a file specifies a full path to an install location, the
+    /// module will be installed to this path. If the path is relative
+    /// (no directory specified, or the path is partial like "usr/lib"
+    /// or "./usr/lib", then the install path will be resolved using
+    /// the platform's current working directory as the base path.
+    ///
+    /// @param[in] file
+    ///     A file specification object.
+    //------------------------------------------------------------------
+    bool
+    SetRemoteInstallFileSpec (lldb::SBFileSpec &file);
+    
+    lldb::ByteOrder
+    GetByteOrder ();
+    
+    uint32_t
+    GetAddressByteSize();
+    
+    const char *
+    GetTriple ();
+
+    const uint8_t *
+    GetUUIDBytes () const;
+
+    const char *
+    GetUUIDString () const;
+
+    bool
+    operator == (const lldb::SBModule &rhs) const;
+
+    bool
+    operator != (const lldb::SBModule &rhs) const;
+
+    lldb::SBSection
+    FindSection (const char *sect_name);
+
+    lldb::SBAddress
+    ResolveFileAddress (lldb::addr_t vm_addr);
+
+    lldb::SBSymbolContext
+    ResolveSymbolContextForAddress (const lldb::SBAddress& addr, 
+                                    uint32_t resolve_scope);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    uint32_t
+    GetNumCompileUnits();
+
+    lldb::SBCompileUnit
+    GetCompileUnitAtIndex (uint32_t);
+
+    size_t
+    GetNumSymbols ();
+    
+    lldb::SBSymbol
+    GetSymbolAtIndex (size_t idx);
+
+    lldb::SBSymbol
+    FindSymbol (const char *name,
+                lldb::SymbolType type = eSymbolTypeAny);
+
+    lldb::SBSymbolContextList
+    FindSymbols (const char *name,
+                 lldb::SymbolType type = eSymbolTypeAny);
+
+    size_t
+    GetNumSections ();
+    
+    lldb::SBSection
+    GetSectionAtIndex (size_t idx);
+    //------------------------------------------------------------------
+    /// Find functions by name.
+    ///
+    /// @param[in] name
+    ///     The name of the function we are looking for.
+    ///
+    /// @param[in] name_type_mask
+    ///     A logical OR of one or more FunctionNameType enum bits that
+    ///     indicate what kind of names should be used when doing the
+    ///     lookup. Bits include fully qualified names, base names,
+    ///     C++ methods, or ObjC selectors. 
+    ///     See FunctionNameType for more details.
+    ///
+    /// @return
+    ///     A lldb::SBSymbolContextList that gets filled in with all of 
+    ///     the symbol contexts for all the matches.
+    //------------------------------------------------------------------
+    lldb::SBSymbolContextList
+    FindFunctions (const char *name, 
+                   uint32_t name_type_mask = lldb::eFunctionNameTypeAny);
+
+    //------------------------------------------------------------------
+    /// Find global and static variables by name.
+    ///
+    /// @param[in] target
+    ///     A valid SBTarget instance representing the debuggee.
+    ///
+    /// @param[in] name
+    ///     The name of the global or static variable we are looking
+    ///     for.
+    ///
+    /// @param[in] max_matches
+    ///     Allow the number of matches to be limited to \a max_matches.
+    ///
+    /// @return
+    ///     A list of matched variables in an SBValueList.
+    //------------------------------------------------------------------
+    lldb::SBValueList
+    FindGlobalVariables (lldb::SBTarget &target, 
+                         const char *name, 
+                         uint32_t max_matches);
+    
+    //------------------------------------------------------------------
+    /// Find the first global (or static) variable by name.
+    ///
+    /// @param[in] target
+    ///     A valid SBTarget instance representing the debuggee.
+    ///
+    /// @param[in] name
+    ///     The name of the global or static variable we are looking
+    ///     for.
+    ///
+    /// @return
+    ///     An SBValue that gets filled in with the found variable (if any).
+    //------------------------------------------------------------------
+    lldb::SBValue
+    FindFirstGlobalVariable (lldb::SBTarget &target, const char *name);
+    
+    lldb::SBType
+    FindFirstType (const char* name);
+    
+    lldb::SBTypeList
+    FindTypes (const char* type);
+    
+    //------------------------------------------------------------------
+    /// Get a type using its type ID.
+    ///
+    /// Each symbol file reader will assign different user IDs to their
+    /// types, but it is sometimes useful when debugging type issues to
+    /// be able to grab a type using its type ID.
+    ///
+    /// For DWARF debug info, the type ID is the DIE offset.
+    ///
+    /// @param[in] uid
+    ///     The type user ID.
+    ///
+    /// @return
+    ///     An SBType for the given type ID, or an empty SBType if the
+    ///     type was not found.
+    //------------------------------------------------------------------
+    lldb::SBType
+    GetTypeByID (lldb::user_id_t uid);
+
+    lldb::SBType
+    GetBasicType(lldb::BasicType type);
+
+    //------------------------------------------------------------------
+    /// Get all types matching \a type_mask from debug info in this
+    /// module.
+    ///
+    /// @param[in] type_mask
+    ///     A bitfield that consists of one or more bits logically OR'ed
+    ///     together from the lldb::TypeClass enumeration. This allows
+    ///     you to request only structure types, or only class, struct
+    ///     and union types. Passing in lldb::eTypeClassAny will return
+    ///     all types found in the debug information for this module.
+    ///
+    /// @return
+    ///     A list of types in this module that match \a type_mask
+    //------------------------------------------------------------------
+    lldb::SBTypeList
+    GetTypes (uint32_t type_mask = lldb::eTypeClassAny);
+
+    //------------------------------------------------------------------
+    /// Get the module version numbers.
+    ///
+    /// Many object files have a set of version numbers that describe
+    /// the version of the executable or shared library. Typically there
+    /// are major, minor and build, but there may be more. This function
+    /// will extract the versions from object files if they are available.
+    ///
+    /// If \a versions is NULL, or if \a num_versions is 0, the return
+    /// value will indicate how many version numbers are available in
+    /// this object file. Then a subsequent call can be made to this 
+    /// function with a value of \a versions and \a num_versions that
+    /// has enough storage to store some or all version numbers.
+    ///
+    /// @param[out] versions
+    ///     A pointer to an array of uint32_t types that is \a num_versions
+    ///     long. If this value is NULL, the return value will indicate
+    ///     how many version numbers are required for a subsequent call
+    ///     to this function so that all versions can be retrieved. If
+    ///     the value is non-NULL, then at most \a num_versions of the
+    ///     existing versions numbers will be filled into \a versions.
+    ///     If there is no version information available, \a versions
+    ///     will be filled with \a num_versions UINT32_MAX values
+    ///     and zero will be returned.
+    ///
+    /// @param[in] num_versions
+    ///     The maximum number of entries to fill into \a versions. If
+    ///     this value is zero, then the return value will indicate
+    ///     how many version numbers there are in total so another call
+    ///     to this function can be make with adequate storage in
+    ///     \a versions to get all of the version numbers. If \a
+    ///     num_versions is less than the actual number of version 
+    ///     numbers in this object file, only \a num_versions will be
+    ///     filled into \a versions (if \a versions is non-NULL).
+    ///
+    /// @return
+    ///     This function always returns the number of version numbers
+    ///     that this object file has regardless of the number of
+    ///     version numbers that were copied into \a versions. 
+    //------------------------------------------------------------------
+    uint32_t
+    GetVersion (uint32_t *versions, 
+                uint32_t num_versions);
+
+    //------------------------------------------------------------------
+    /// Get accessor for the symbol file specification.
+    ///
+    /// When debugging an object file an additional debug information can
+    /// be provided in separate file. Therefore if you debugging something
+    /// like '/usr/lib/liba.dylib' then debug information can be located
+    /// in folder like '/usr/lib/liba.dylib.dSYM/'.
+    ///
+    /// @return
+    ///     A const reference to the file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetSymbolFileSpec() const;
+
+    lldb::SBAddress
+    GetObjectFileHeaderAddress() const;
+
+private:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBSection;
+    friend class SBSymbolContext;
+    friend class SBTarget;
+
+    explicit SBModule (const lldb::ModuleSP& module_sp);
+
+    ModuleSP
+    GetSP () const;
+    
+    void
+    SetSP (const ModuleSP &module_sp);
+
+    lldb::ModuleSP m_opaque_sp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBModule_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h b/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
new file mode 100644
index 000000000000..d533de3c7bce
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
@@ -0,0 +1,154 @@
+//===-- SBModuleSpec.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBModuleSpec_h_
+#define LLDB_SBModuleSpec_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
+
+namespace lldb {
+
+class LLDB_API SBModuleSpec
+{
+public:
+
+    SBModuleSpec ();
+
+    SBModuleSpec (const SBModuleSpec &rhs);
+
+    ~SBModuleSpec ();
+
+    const SBModuleSpec &
+    operator = (const SBModuleSpec &rhs);
+
+    bool
+    IsValid () const;
+
+    void
+    Clear();
+
+    //------------------------------------------------------------------
+    /// Get const accessor for the module file.
+    ///
+    /// This function returns the file for the module on the host system
+    /// that is running LLDB. This can differ from the path on the 
+    /// platform since we might be doing remote debugging.
+    ///
+    /// @return
+    ///     A const reference to the file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetFileSpec ();
+
+    void
+    SetFileSpec (const lldb::SBFileSpec &fspec);
+
+    //------------------------------------------------------------------
+    /// Get accessor for the module platform file.
+    ///
+    /// Platform file refers to the path of the module as it is known on
+    /// the remote system on which it is being debugged. For local 
+    /// debugging this is always the same as Module::GetFileSpec(). But
+    /// remote debugging might mention a file '/usr/lib/liba.dylib'
+    /// which might be locally downloaded and cached. In this case the
+    /// platform file could be something like:
+    /// '/tmp/lldb/platform-cache/remote.host.computer/usr/lib/liba.dylib'
+    /// The file could also be cached in a local developer kit directory.
+    ///
+    /// @return
+    ///     A const reference to the file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetPlatformFileSpec ();
+
+    void
+    SetPlatformFileSpec (const lldb::SBFileSpec &fspec);
+
+    lldb::SBFileSpec
+    GetSymbolFileSpec ();
+    
+    void
+    SetSymbolFileSpec (const lldb::SBFileSpec &fspec);
+
+    const char *
+    GetObjectName ();
+    
+    void
+    SetObjectName (const char *name);
+
+    const char *
+    GetTriple ();
+
+    void
+    SetTriple (const char *triple);
+
+    const uint8_t *
+    GetUUIDBytes ();
+
+    size_t
+    GetUUIDLength ();
+
+    bool
+    SetUUIDBytes (const uint8_t *uuid, size_t uuid_len);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+    
+private:
+    friend class SBModuleSpecList;
+    friend class SBModule;
+    friend class SBTarget;
+
+    std::unique_ptr<lldb_private::ModuleSpec> m_opaque_ap;
+};
+
+class SBModuleSpecList
+{
+public:
+    SBModuleSpecList();
+
+    SBModuleSpecList (const SBModuleSpecList &rhs);
+
+    ~SBModuleSpecList();
+
+    SBModuleSpecList &
+    operator = (const SBModuleSpecList &rhs);
+    
+    static SBModuleSpecList
+    GetModuleSpecifications (const char *path);
+    
+    void
+    Append (const SBModuleSpec &spec);
+    
+    void
+    Append (const SBModuleSpecList &spec_list);
+
+    SBModuleSpec
+    FindFirstMatchingSpec (const SBModuleSpec &match_spec);
+
+    SBModuleSpecList
+    FindMatchingSpecs (const SBModuleSpec &match_spec);
+
+    size_t
+    GetSize();
+    
+    SBModuleSpec
+    GetSpecAtIndex (size_t i);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+    
+private:
+    std::unique_ptr<lldb_private::ModuleSpecList> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBModuleSpec_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBPlatform.h b/kcov-38/external/lldb/include/lldb/API/SBPlatform.h
new file mode 100644
index 000000000000..db4a754103ca
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBPlatform.h
@@ -0,0 +1,211 @@
+//===-- SBPlatform.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBPlatform_h_
+#define LLDB_SBPlatform_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <functional>
+
+struct PlatformConnectOptions;
+struct PlatformShellCommand;
+
+namespace lldb {
+
+    class SBLaunchInfo;
+
+    class LLDB_API SBPlatformConnectOptions
+    {
+    public:
+        SBPlatformConnectOptions (const char *url);
+
+        SBPlatformConnectOptions (const SBPlatformConnectOptions &rhs);
+
+        ~SBPlatformConnectOptions ();
+        
+        void
+        operator=(const SBPlatformConnectOptions &rhs);
+
+        const char *
+        GetURL();
+        
+        void
+        SetURL(const char *url);
+        
+        bool
+        GetRsyncEnabled();
+        
+        void
+        EnableRsync (const char *options,
+                     const char *remote_path_prefix,
+                     bool omit_remote_hostname);
+                     
+        void
+        DisableRsync ();
+        
+        const char *
+        GetLocalCacheDirectory();
+
+        void
+        SetLocalCacheDirectory(const char *path);
+    protected:
+        PlatformConnectOptions *m_opaque_ptr;
+    };
+
+    class LLDB_API SBPlatformShellCommand
+    {
+    public:
+        SBPlatformShellCommand (const char *shell_command);
+        
+        SBPlatformShellCommand (const SBPlatformShellCommand &rhs);
+        
+        ~SBPlatformShellCommand();
+        
+        void
+        Clear();
+
+        const char *
+        GetCommand();
+
+        void
+        SetCommand(const char *shell_command);
+        
+        const char *
+        GetWorkingDirectory ();
+
+        void
+        SetWorkingDirectory (const char *path);
+
+        uint32_t
+        GetTimeoutSeconds ();
+        
+        void
+        SetTimeoutSeconds (uint32_t sec);
+        
+        int
+        GetSignal ();
+        
+        int
+        GetStatus ();
+        
+        const char *
+        GetOutput ();
+
+    protected:
+        friend class SBPlatform;
+
+        PlatformShellCommand *m_opaque_ptr;
+    };
+
+    class LLDB_API SBPlatform
+    {
+    public:
+        
+        SBPlatform ();
+        
+        SBPlatform (const char *platform_name);
+        
+        ~SBPlatform();
+        
+        bool
+        IsValid () const;
+        
+        void
+        Clear ();
+
+        const char *
+        GetWorkingDirectory();
+
+        bool
+        SetWorkingDirectory(const char *path);
+
+        const char *
+        GetName ();
+
+        SBError
+        ConnectRemote (SBPlatformConnectOptions &connect_options);
+
+        void
+        DisconnectRemote ();
+        
+        bool
+        IsConnected();
+
+        //----------------------------------------------------------------------
+        // The following functions will work if the platform is connected
+        //----------------------------------------------------------------------
+        const char *
+        GetTriple();
+
+        const char *
+        GetHostname ();
+        
+        const char *
+        GetOSBuild ();
+        
+        const char *
+        GetOSDescription ();
+
+        uint32_t
+        GetOSMajorVersion ();
+
+        uint32_t
+        GetOSMinorVersion ();
+
+        uint32_t
+        GetOSUpdateVersion ();
+
+        SBError
+        Put (SBFileSpec &src, SBFileSpec &dst);
+        
+        SBError
+        Get (SBFileSpec &src, SBFileSpec &dst);
+
+        SBError
+        Install (SBFileSpec& src, SBFileSpec& dst);
+
+        SBError
+        Run (SBPlatformShellCommand &shell_command);
+
+        SBError
+        Launch (SBLaunchInfo &launch_info);
+
+        SBError
+        Kill (const lldb::pid_t pid);
+
+        SBError
+        MakeDirectory (const char *path, uint32_t file_permissions = eFilePermissionsDirectoryDefault);
+
+        uint32_t
+        GetFilePermissions (const char *path);
+        
+        SBError
+        SetFilePermissions (const char *path, uint32_t file_permissions);
+
+    protected:
+        
+        friend class SBDebugger;
+        friend class SBTarget;
+
+        lldb::PlatformSP
+        GetSP () const;
+        
+        void
+        SetSP (const lldb::PlatformSP& platform_sp);
+
+        SBError
+        ExecuteConnected (const std::function<lldb_private::Error(const lldb::PlatformSP&)>& func);
+
+        lldb::PlatformSP m_opaque_sp;
+    };
+
+} // namespace lldb
+
+#endif // LLDB_SBPlatform_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBProcess.h b/kcov-38/external/lldb/include/lldb/API/SBProcess.h
new file mode 100644
index 000000000000..71bca4fc697a
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBProcess.h
@@ -0,0 +1,369 @@
+//===-- SBProcess.h ---------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBProcess_h_
+#define LLDB_SBProcess_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBQueue.h"
+#include <stdio.h>
+
+namespace lldb {
+
+class SBEvent;
+
+class LLDB_API SBProcess
+{
+public:
+    //------------------------------------------------------------------
+    /// Broadcaster event bits definitions.
+    //------------------------------------------------------------------
+    FLAGS_ANONYMOUS_ENUM()
+    {
+        eBroadcastBitStateChanged   = (1 << 0),
+        eBroadcastBitInterrupt      = (1 << 1),
+        eBroadcastBitSTDOUT         = (1 << 2),
+        eBroadcastBitSTDERR         = (1 << 3),
+        eBroadcastBitProfileData    = (1 << 4)
+    };
+
+    SBProcess ();
+
+    SBProcess (const lldb::SBProcess& rhs);
+
+    const lldb::SBProcess&
+    operator = (const lldb::SBProcess& rhs);
+
+    SBProcess (const lldb::ProcessSP &process_sp);
+    
+    ~SBProcess();
+
+    static const char *
+    GetBroadcasterClassName ();
+    
+    const char *
+    GetPluginName ();
+    
+    // DEPRECATED: use GetPluginName()
+    const char *
+    GetShortPluginName ();
+    
+    void
+    Clear ();
+
+    bool
+    IsValid() const;
+
+    lldb::SBTarget
+    GetTarget() const;
+
+    lldb::ByteOrder
+    GetByteOrder() const;
+
+    size_t
+    PutSTDIN (const char *src, size_t src_len);
+
+    size_t
+    GetSTDOUT (char *dst, size_t dst_len) const;
+
+    size_t
+    GetSTDERR (char *dst, size_t dst_len) const;
+
+    size_t
+    GetAsyncProfileData(char *dst, size_t dst_len) const;
+    
+    void
+    ReportEventState (const lldb::SBEvent &event, FILE *out) const;
+
+    void
+    AppendEventStateReport (const lldb::SBEvent &event, lldb::SBCommandReturnObject &result);
+
+    //------------------------------------------------------------------
+    /// Remote connection related functions. These will fail if the
+    /// process is not in eStateConnected. They are intended for use
+    /// when connecting to an externally managed debugserver instance.
+    //------------------------------------------------------------------
+    bool
+    RemoteAttachToProcessWithID (lldb::pid_t pid,
+                                 lldb::SBError& error);
+    
+    bool
+    RemoteLaunch (char const **argv,
+                  char const **envp,
+                  const char *stdin_path,
+                  const char *stdout_path,
+                  const char *stderr_path,
+                  const char *working_directory,
+                  uint32_t launch_flags,
+                  bool stop_at_entry,
+                  lldb::SBError& error);
+    
+    //------------------------------------------------------------------
+    // Thread related functions
+    //------------------------------------------------------------------
+    uint32_t
+    GetNumThreads ();
+
+    lldb::SBThread
+    GetThreadAtIndex (size_t index);
+
+    lldb::SBThread
+    GetThreadByID (lldb::tid_t sb_thread_id);
+
+    lldb::SBThread
+    GetThreadByIndexID (uint32_t index_id);
+
+    lldb::SBThread
+    GetSelectedThread () const;
+
+    //------------------------------------------------------------------
+    // Function for lazily creating a thread using the current OS
+    // plug-in. This function will be removed in the future when there
+    // are APIs to create SBThread objects through the interface and add
+    // them to the process through the SBProcess API.
+    //------------------------------------------------------------------
+    lldb::SBThread
+    CreateOSPluginThread (lldb::tid_t tid, lldb::addr_t context);
+
+    bool
+    SetSelectedThread (const lldb::SBThread &thread);
+
+    bool
+    SetSelectedThreadByID (lldb::tid_t tid);
+    
+    bool
+    SetSelectedThreadByIndexID (uint32_t index_id);
+
+    //------------------------------------------------------------------
+    // Queue related functions
+    //------------------------------------------------------------------
+    uint32_t
+    GetNumQueues ();
+
+    lldb::SBQueue
+    GetQueueAtIndex (size_t index);
+
+    //------------------------------------------------------------------
+    // Stepping related functions
+    //------------------------------------------------------------------
+
+    lldb::StateType
+    GetState ();
+
+    int
+    GetExitStatus ();
+
+    const char *
+    GetExitDescription ();
+
+    //------------------------------------------------------------------
+    /// Gets the process ID
+    ///
+    /// Returns the process identifier for the process as it is known
+    /// on the system on which the process is running. For unix systems
+    /// this is typically the same as if you called "getpid()" in the
+    /// process.
+    ///
+    /// @return
+    ///     Returns LLDB_INVALID_PROCESS_ID if this object does not
+    ///     contain a valid process object, or if the process has not
+    ///     been launched. Returns a valid process ID if the process is
+    ///     valid.
+    //------------------------------------------------------------------
+    lldb::pid_t
+    GetProcessID ();
+
+    //------------------------------------------------------------------
+    /// Gets the unique ID associated with this process object
+    ///
+    /// Unique IDs start at 1 and increment up with each new process
+    /// instance. Since starting a process on a system might always
+    /// create a process with the same process ID, there needs to be a
+    /// way to tell two process instances apart.
+    ///
+    /// @return
+    ///     Returns a non-zero integer ID if this object contains a
+    ///     valid process object, zero if this object does not contain
+    ///     a valid process object.
+    //------------------------------------------------------------------
+    uint32_t
+    GetUniqueID();
+
+    uint32_t
+    GetAddressByteSize() const;
+
+    lldb::SBError
+    Destroy ();
+
+    lldb::SBError
+    Continue ();
+
+    lldb::SBError
+    Stop ();
+
+    lldb::SBError
+    Kill ();
+
+    lldb::SBError
+    Detach ();
+
+    lldb::SBError
+    Detach (bool keep_stopped);
+
+    lldb::SBError
+    Signal (int signal);
+
+    lldb::SBUnixSignals
+    GetUnixSignals();
+
+    void
+    SendAsyncInterrupt();
+    
+    uint32_t
+    GetStopID(bool include_expression_stops = false);
+
+    //------------------------------------------------------------------
+    /// Gets the stop event corresponding to stop ID.
+    //
+    /// Note that it wasn't fully implemented and tracks only the stop
+    /// event for the last natural stop ID.
+    ///
+    /// @param [in] stop_id
+    ///   The ID of the stop event to return.
+    ///
+    /// @return
+    ///   The stop event corresponding to stop ID.
+    //------------------------------------------------------------------
+    lldb::SBEvent
+    GetStopEventForStopID(uint32_t stop_id);
+
+    size_t
+    ReadMemory (addr_t addr, void *buf, size_t size, lldb::SBError &error);
+
+    size_t
+    WriteMemory (addr_t addr, const void *buf, size_t size, lldb::SBError &error);
+
+    size_t
+    ReadCStringFromMemory (addr_t addr, void *buf, size_t size, lldb::SBError &error);
+
+    uint64_t
+    ReadUnsignedFromMemory (addr_t addr, uint32_t byte_size, lldb::SBError &error);
+
+    lldb::addr_t
+    ReadPointerFromMemory (addr_t addr, lldb::SBError &error);
+
+    // Events
+    static lldb::StateType
+    GetStateFromEvent (const lldb::SBEvent &event);
+
+    static bool
+    GetRestartedFromEvent (const lldb::SBEvent &event);
+    
+    static size_t
+    GetNumRestartedReasonsFromEvent (const lldb::SBEvent &event);
+    
+    static const char *
+    GetRestartedReasonAtIndexFromEvent (const lldb::SBEvent &event, size_t idx);
+
+    static lldb::SBProcess
+    GetProcessFromEvent (const lldb::SBEvent &event);
+
+    static bool
+    GetInterruptedFromEvent (const lldb::SBEvent &event);
+    
+    static bool
+    EventIsProcessEvent (const lldb::SBEvent &event);
+
+    lldb::SBBroadcaster
+    GetBroadcaster () const;
+
+    static const char *
+    GetBroadcasterClass ();
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    uint32_t
+    GetNumSupportedHardwareWatchpoints (lldb::SBError &error) const;
+
+    uint32_t
+    LoadImage (lldb::SBFileSpec &image_spec, lldb::SBError &error);
+    
+    lldb::SBError
+    UnloadImage (uint32_t image_token);
+    
+    lldb::SBError
+    SendEventData (const char *data);
+    
+    //------------------------------------------------------------------
+    /// Return the number of different thread-origin extended backtraces
+    /// this process can support.
+    ///
+    /// When the process is stopped and you have an SBThread, lldb may be
+    /// able to show a backtrace of when that thread was originally created,
+    /// or the work item was enqueued to it (in the case of a libdispatch 
+    /// queue).
+    ///
+    /// @return
+    ///   The number of thread-origin extended backtrace types that may be
+    ///   available.
+    //------------------------------------------------------------------
+    uint32_t
+    GetNumExtendedBacktraceTypes ();
+
+    //------------------------------------------------------------------
+    /// Return the name of one of the thread-origin extended backtrace 
+    /// methods.
+    ///
+    /// @param [in] idx
+    ///   The index of the name to return.  They will be returned in
+    ///   the order that the user will most likely want to see them.
+    ///   e.g. if the type at index 0 is not available for a thread, 
+    ///   see if the type at index 1 provides an extended backtrace.
+    ///
+    /// @return
+    ///   The name at that index.
+    //------------------------------------------------------------------
+    const char *
+    GetExtendedBacktraceTypeAtIndex (uint32_t idx);
+    
+    lldb::SBThreadCollection
+    GetHistoryThreads (addr_t addr);
+    
+    bool
+    IsInstrumentationRuntimePresent(InstrumentationRuntimeType type);
+
+protected:
+    friend class SBAddress;
+    friend class SBBreakpoint;
+    friend class SBBreakpointLocation;
+    friend class SBCommandInterpreter;
+    friend class SBDebugger;
+    friend class SBExecutionContext;
+    friend class SBFunction;
+    friend class SBModule;
+    friend class SBTarget;
+    friend class SBThread;
+    friend class SBValue;
+    friend class lldb_private::QueueImpl;
+
+    lldb::ProcessSP
+    GetSP() const;
+    
+    void
+    SetSP (const lldb::ProcessSP &process_sp);
+
+    lldb::ProcessWP m_opaque_wp;
+};
+
+}  // namespace lldb
+
+#endif  // LLDB_SBProcess_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBQueue.h b/kcov-38/external/lldb/include/lldb/API/SBQueue.h
new file mode 100644
index 000000000000..2f453cddd5d1
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBQueue.h
@@ -0,0 +1,89 @@
+//===-- SBQueue.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBQueue_h_
+#define LLDB_SBQueue_h_
+
+#include <vector>
+
+#include "lldb/lldb-forward.h"
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBQueue
+{
+public:
+    SBQueue ();
+
+    SBQueue (const QueueSP& queue_sp);
+    
+    SBQueue (const SBQueue& rhs);
+
+    const SBQueue &
+    operator= (const lldb::SBQueue& rhs);
+
+   ~SBQueue();
+
+    bool
+    IsValid() const;
+
+    void
+    Clear ();
+
+    lldb::SBProcess
+    GetProcess ();
+
+    lldb::queue_id_t
+    GetQueueID () const;
+
+    const char *
+    GetName () const;
+
+    uint32_t
+    GetIndexID () const;
+
+    uint32_t
+    GetNumThreads ();
+
+    lldb::SBThread
+    GetThreadAtIndex (uint32_t);
+
+    uint32_t
+    GetNumPendingItems ();
+
+    lldb::SBQueueItem
+    GetPendingItemAtIndex (uint32_t);
+
+    uint32_t
+    GetNumRunningItems ();
+
+    lldb::QueueKind
+    GetKind ();
+
+protected:
+    friend class SBProcess;
+    friend class SBThread;
+
+    void
+    SetQueue (const lldb::QueueSP& queue_sp);
+
+    void
+    FetchThreads ();
+
+    void
+    FetchItems ();
+
+private:
+    std::shared_ptr<lldb_private::QueueImpl> m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBQueue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h b/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
new file mode 100644
index 000000000000..9426a53b2376
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
@@ -0,0 +1,57 @@
+//===-- SBQueueItem.h -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBQueueItem_h_
+#define LLDB_SBQueueItem_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+
+namespace lldb {
+
+class LLDB_API SBQueueItem
+{
+public:
+    SBQueueItem ();
+
+    SBQueueItem (const lldb::QueueItemSP& queue_item_sp);
+    
+   ~SBQueueItem();
+
+    bool
+    IsValid() const;
+
+    void
+    Clear ();
+
+    lldb::QueueItemKind
+    GetKind () const;
+
+    void
+    SetKind (lldb::QueueItemKind kind);
+
+    lldb::SBAddress
+    GetAddress () const;
+
+    void
+    SetAddress (lldb::SBAddress addr);
+
+    void
+    SetQueueItem (const lldb::QueueItemSP& queue_item_sp);
+
+    SBThread
+    GetExtendedBacktraceThread (const char *type);
+
+private:
+    lldb::QueueItemSP           m_queue_item_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBQueueItem_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSection.h b/kcov-38/external/lldb/include/lldb/API/SBSection.h
new file mode 100644
index 000000000000..0a22413b5b9c
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBSection.h
@@ -0,0 +1,116 @@
+//===-- SBSection.h ---------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBSection_h_
+#define LLDB_SBSection_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBData.h"
+
+namespace lldb {
+
+class LLDB_API SBSection
+{
+public:
+
+    SBSection ();
+
+    SBSection (const lldb::SBSection &rhs);
+
+    ~SBSection ();
+
+    const lldb::SBSection &
+    operator = (const lldb::SBSection &rhs);
+
+    bool
+    IsValid () const;
+
+    const char *
+    GetName ();
+
+    lldb::SBSection
+    GetParent();
+
+    lldb::SBSection
+    FindSubSection (const char *sect_name);
+
+    size_t
+    GetNumSubSections ();
+
+    lldb::SBSection
+    GetSubSectionAtIndex (size_t idx);
+
+    lldb::addr_t
+    GetFileAddress ();
+
+    lldb::addr_t
+    GetLoadAddress (lldb::SBTarget &target);
+    
+    lldb::addr_t
+    GetByteSize ();
+
+    uint64_t
+    GetFileOffset ();
+
+    uint64_t
+    GetFileByteSize ();
+    
+    lldb::SBData
+    GetSectionData ();
+
+    lldb::SBData
+    GetSectionData (uint64_t offset,
+                    uint64_t size);
+    
+    SectionType
+    GetSectionType ();
+
+    //------------------------------------------------------------------
+    /// Return the size of a target's byte represented by this section
+    /// in numbers of host bytes. Note that certain architectures have
+    /// varying minimum addressable unit (i.e. byte) size for their 
+    /// CODE or DATA buses.
+    ///
+    /// @return
+    ///     The number of host (8-bit) bytes needed to hold a target byte
+    //------------------------------------------------------------------
+    uint32_t
+    GetTargetByteSize ();
+
+    bool
+    operator == (const lldb::SBSection &rhs);
+
+    bool
+    operator != (const lldb::SBSection &rhs);
+
+    bool
+    GetDescription (lldb::SBStream &description);
+    
+
+private:
+
+    friend class SBAddress;
+    friend class SBModule;
+    friend class SBTarget;
+    
+    SBSection (const lldb::SectionSP &section_sp);
+
+    lldb::SectionSP
+    GetSP() const;
+    
+    void
+    SetSP(const lldb::SectionSP &section_sp);
+    
+    lldb::SectionWP m_opaque_wp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBSection_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h b/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
new file mode 100644
index 000000000000..6e7358f16e77
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
@@ -0,0 +1,53 @@
+//===-- SBSourceManager.h ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBSourceManager_h_
+#define LLDB_SBSourceManager_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+
+namespace lldb {
+
+class LLDB_API SBSourceManager
+{
+public:
+    SBSourceManager (const SBDebugger &debugger);
+    SBSourceManager (const SBTarget &target);
+    SBSourceManager (const SBSourceManager &rhs);
+    
+    ~SBSourceManager();
+
+    const lldb::SBSourceManager &
+    operator = (const lldb::SBSourceManager &rhs);
+
+    size_t
+    DisplaySourceLinesWithLineNumbers (const lldb::SBFileSpec &file,
+                                       uint32_t line,
+                                       uint32_t context_before,
+                                       uint32_t context_after,
+                                       const char* current_line_cstr,
+                                       lldb::SBStream &s);
+
+
+protected:
+    friend class SBCommandInterpreter;
+    friend class SBDebugger;
+
+    SBSourceManager(lldb_private::SourceManager *source_manager);
+
+private:
+
+    std::unique_ptr<lldb_private::SourceManagerImpl> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBSourceManager_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBStream.h b/kcov-38/external/lldb/include/lldb/API/SBStream.h
new file mode 100644
index 000000000000..2b25cd2c68f2
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBStream.h
@@ -0,0 +1,114 @@
+//===-- SBStream.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBStream_h_
+#define LLDB_SBStream_h_
+
+#include <stdio.h>
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBStream
+{
+public:
+
+    SBStream ();
+    
+    ~SBStream ();
+
+    bool
+    IsValid() const;
+
+    // If this stream is not redirected to a file, it will maintain a local
+    // cache for the stream data which can be accessed using this accessor.
+    const char *
+    GetData ();
+
+    // If this stream is not redirected to a file, it will maintain a local
+    // cache for the stream output whose length can be accessed using this 
+    // accessor.
+    size_t
+    GetSize();
+
+    void
+    Printf (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+
+    void
+    RedirectToFile (const char *path, bool append);
+
+    void
+    RedirectToFileHandle (FILE *fh, bool transfer_fh_ownership);
+
+    void
+    RedirectToFileDescriptor (int fd, bool transfer_fh_ownership);
+
+    // If the stream is redirected to a file, forget about the file and if
+    // ownership of the file was transferred to this object, close the file.
+    // If the stream is backed by a local cache, clear this cache.
+    void
+    Clear ();
+
+protected:
+    friend class SBAddress;
+    friend class SBBlock;
+    friend class SBBreakpoint;
+    friend class SBBreakpointLocation;
+    friend class SBCommandReturnObject;
+    friend class SBCompileUnit;
+    friend class SBData;
+    friend class SBDebugger;
+    friend class SBDeclaration;
+    friend class SBEvent;
+    friend class SBFileSpec;
+    friend class SBFileSpecList;
+    friend class SBFrame;
+    friend class SBFunction;
+    friend class SBInstruction;
+    friend class SBInstructionList;
+    friend class SBLineEntry;
+    friend class SBModule;
+    friend class SBModuleSpec;
+    friend class SBModuleSpecList;
+    friend class SBProcess;
+    friend class SBSection;
+    friend class SBSourceManager;
+    friend class SBSymbol;
+    friend class SBSymbolContext;
+    friend class SBSymbolContextList;
+    friend class SBTarget;
+    friend class SBThread;
+    friend class SBThreadPlan;
+    friend class SBType;
+    friend class SBTypeEnumMember;
+    friend class SBTypeMemberFunction;
+    friend class SBTypeMember;
+    friend class SBValue;
+    friend class SBWatchpoint;
+
+    lldb_private::Stream *
+    operator->();
+
+    lldb_private::Stream *
+    get();
+
+    lldb_private::Stream &
+    ref();
+
+private:
+
+    DISALLOW_COPY_AND_ASSIGN (SBStream);
+    std::unique_ptr<lldb_private::Stream> m_opaque_ap;
+    bool m_is_file;
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBStream_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBStringList.h b/kcov-38/external/lldb/include/lldb/API/SBStringList.h
new file mode 100644
index 000000000000..e0e58f765c6d
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBStringList.h
@@ -0,0 +1,71 @@
+//===-- SBStringList.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBStringList_h_
+#define LLDB_SBStringList_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBStringList
+{
+public:
+
+    SBStringList ();
+
+    SBStringList (const lldb::SBStringList &rhs);
+    
+    const SBStringList &
+    operator = (const SBStringList &rhs);
+
+    ~SBStringList ();
+
+    bool
+    IsValid() const;
+
+    void
+    AppendString (const char *str);
+
+    void
+    AppendList (const char **strv, int strc);
+
+    void
+    AppendList (const lldb::SBStringList &strings);
+
+    uint32_t
+    GetSize () const;
+
+    const char *
+    GetStringAtIndex (size_t idx);
+
+    void
+    Clear ();
+
+protected:
+    friend class SBCommandInterpreter;
+    friend class SBDebugger;
+
+    SBStringList (const lldb_private::StringList *lldb_strings);
+
+    const lldb_private::StringList *
+    operator->() const;
+
+    const lldb_private::StringList &
+    operator*() const;
+
+private:
+
+    std::unique_ptr<lldb_private::StringList> m_opaque_ap;
+
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBStringList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbol.h b/kcov-38/external/lldb/include/lldb/API/SBSymbol.h
new file mode 100644
index 000000000000..3d259a2c20c6
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBSymbol.h
@@ -0,0 +1,109 @@
+//===-- SBSymbol.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBSymbol_h_
+#define LLDB_SBSymbol_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBInstructionList.h"
+#include "lldb/API/SBTarget.h"
+
+namespace lldb {
+
+class LLDB_API SBSymbol
+{
+public:
+
+    SBSymbol ();
+
+    ~SBSymbol ();
+
+    SBSymbol (const lldb::SBSymbol &rhs);
+
+    const lldb::SBSymbol &
+    operator = (const lldb::SBSymbol &rhs);
+
+    bool
+    IsValid () const;
+
+
+    const char *
+    GetName() const;
+
+    const char *
+    GetMangledName () const;
+
+    lldb::SBInstructionList
+    GetInstructions (lldb::SBTarget target);
+
+    lldb::SBInstructionList
+    GetInstructions (lldb::SBTarget target, const char *flavor_string);
+
+    SBAddress
+    GetStartAddress ();
+    
+    SBAddress
+    GetEndAddress ();
+    
+    uint32_t
+    GetPrologueByteSize ();
+
+    SymbolType
+    GetType ();
+
+    bool
+    operator == (const lldb::SBSymbol &rhs) const;
+
+    bool
+    operator != (const lldb::SBSymbol &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    //----------------------------------------------------------------------
+    // Returns true if the symbol is externally visible in the module that
+    // it is defined in
+    //----------------------------------------------------------------------
+    bool
+    IsExternal();
+
+    //----------------------------------------------------------------------
+    // Returns true if the symbol was synthetically generated from something
+    // other than the actual symbol table itself in the object file.
+    //----------------------------------------------------------------------
+    bool
+    IsSynthetic();
+
+protected:
+
+    lldb_private::Symbol *
+    get ();
+
+    void
+    reset (lldb_private::Symbol *);
+    
+private:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBModule;
+    friend class SBSymbolContext;
+
+    SBSymbol (lldb_private::Symbol *lldb_object_ptr);
+    
+    void
+    SetSymbol (lldb_private::Symbol *lldb_object_ptr);
+
+    lldb_private::Symbol *m_opaque_ptr;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBSymbol_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h b/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
new file mode 100644
index 000000000000..24c2ce9a1d6e
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
@@ -0,0 +1,94 @@
+//===-- SBSymbolContext.h ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBSymbolContext_h_
+#define LLDB_SBSymbolContext_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBlock.h"
+#include "lldb/API/SBCompileUnit.h"
+#include "lldb/API/SBFunction.h"
+#include "lldb/API/SBLineEntry.h"
+#include "lldb/API/SBModule.h"
+#include "lldb/API/SBSymbol.h"
+
+namespace lldb {
+
+class LLDB_API SBSymbolContext
+{
+public:
+    SBSymbolContext ();
+
+    SBSymbolContext (const lldb::SBSymbolContext& rhs);
+
+    ~SBSymbolContext ();
+
+    bool
+    IsValid () const;
+
+    const lldb::SBSymbolContext &
+    operator = (const lldb::SBSymbolContext &rhs);
+
+    lldb::SBModule        GetModule ();
+    lldb::SBCompileUnit   GetCompileUnit ();
+    lldb::SBFunction      GetFunction ();
+    lldb::SBBlock         GetBlock ();
+    lldb::SBLineEntry     GetLineEntry ();
+    lldb::SBSymbol        GetSymbol ();
+
+    void SetModule (lldb::SBModule module);
+    void SetCompileUnit (lldb::SBCompileUnit compile_unit);
+    void SetFunction (lldb::SBFunction function);
+    void SetBlock (lldb::SBBlock block);
+    void SetLineEntry (lldb::SBLineEntry line_entry);
+    void SetSymbol (lldb::SBSymbol symbol);
+
+    SBSymbolContext
+    GetParentOfInlinedScope (const SBAddress &curr_frame_pc, 
+                             SBAddress &parent_frame_addr) const;
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+protected:
+    friend class SBAddress;
+    friend class SBFrame;
+    friend class SBModule;
+    friend class SBThread;
+    friend class SBTarget;
+    friend class SBSymbolContextList;
+
+    lldb_private::SymbolContext*
+    operator->() const;
+
+    lldb_private::SymbolContext&
+    operator*();
+
+    lldb_private::SymbolContext&
+    ref();
+
+    const lldb_private::SymbolContext&
+    operator*() const;
+
+    lldb_private::SymbolContext *
+    get() const;
+
+    SBSymbolContext (const lldb_private::SymbolContext *sc_ptr);
+
+    void
+    SetSymbolContext (const lldb_private::SymbolContext *sc_ptr);
+
+private:
+    std::unique_ptr<lldb_private::SymbolContext> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBSymbolContext_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h b/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
new file mode 100644
index 000000000000..79dcccdcbf84
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
@@ -0,0 +1,69 @@
+//===-- SBSymbolContextList.h -----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBSymbolContextList_h_
+#define LLDB_SBSymbolContextList_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBSymbolContext.h"
+
+namespace lldb {
+
+class LLDB_API SBSymbolContextList
+{
+public:
+    SBSymbolContextList ();
+
+    SBSymbolContextList (const lldb::SBSymbolContextList& rhs);
+
+    ~SBSymbolContextList ();
+
+    const lldb::SBSymbolContextList &
+    operator = (const lldb::SBSymbolContextList &rhs);
+
+    bool
+    IsValid () const;
+
+    uint32_t
+    GetSize() const;
+
+    lldb::SBSymbolContext
+    GetContextAtIndex (uint32_t idx);
+    
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    void
+    Append (lldb::SBSymbolContext &sc);
+    
+    void
+    Append (lldb::SBSymbolContextList &sc_list);
+    
+    void
+    Clear();
+
+protected:
+
+    friend class SBModule;
+    friend class SBTarget;
+
+    lldb_private::SymbolContextList*
+    operator->() const;
+
+    lldb_private::SymbolContextList&
+    operator*() const;
+
+private:
+    std::unique_ptr<lldb_private::SymbolContextList> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBSymbolContextList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTarget.h b/kcov-38/external/lldb/include/lldb/API/SBTarget.h
new file mode 100644
index 000000000000..dcca4e7b3a19
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTarget.h
@@ -0,0 +1,819 @@
+//===-- SBTarget.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTarget_h_
+#define LLDB_SBTarget_h_
+
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBAttachInfo.h"
+#include "lldb/API/SBBroadcaster.h"
+#include "lldb/API/SBFileSpec.h"
+#include "lldb/API/SBFileSpecList.h"
+#include "lldb/API/SBLaunchInfo.h"
+#include "lldb/API/SBSymbolContextList.h"
+#include "lldb/API/SBType.h"
+#include "lldb/API/SBValue.h"
+#include "lldb/API/SBWatchpoint.h"
+
+namespace lldb {
+
+class SBPlatform;
+
+class LLDB_API SBTarget
+{
+public:
+    //------------------------------------------------------------------
+    // Broadcaster bits.
+    //------------------------------------------------------------------
+    enum
+    {
+        eBroadcastBitBreakpointChanged  = (1 << 0),
+        eBroadcastBitModulesLoaded      = (1 << 1),
+        eBroadcastBitModulesUnloaded    = (1 << 2),
+        eBroadcastBitWatchpointChanged  = (1 << 3),
+        eBroadcastBitSymbolsLoaded      = (1 << 4)
+    };
+
+    //------------------------------------------------------------------
+    // Constructors
+    //------------------------------------------------------------------
+    SBTarget ();
+
+    SBTarget (const lldb::SBTarget& rhs);
+
+    SBTarget (const lldb::TargetSP& target_sp);
+    
+    const lldb::SBTarget&
+    operator = (const lldb::SBTarget& rhs);
+
+    //------------------------------------------------------------------
+    // Destructor
+    //------------------------------------------------------------------
+    ~SBTarget();
+
+    bool
+    IsValid() const;
+
+    static bool
+    EventIsTargetEvent (const lldb::SBEvent &event);
+
+    static lldb::SBTarget
+    GetTargetFromEvent (const lldb::SBEvent &event);
+    
+    static uint32_t
+    GetNumModulesFromEvent (const lldb::SBEvent &event);
+
+    static lldb::SBModule
+    GetModuleAtIndexFromEvent (const uint32_t idx, const lldb::SBEvent &event);
+
+    static const char *
+    GetBroadcasterClassName ();
+
+    lldb::SBProcess
+    GetProcess ();
+
+    //------------------------------------------------------------------
+    /// Return the platform object associated with the target.
+    ///
+    /// After return, the platform object should be checked for
+    /// validity.
+    ///
+    /// @return
+    ///     A platform object.
+    //------------------------------------------------------------------
+    lldb::SBPlatform
+    GetPlatform ();
+
+    //------------------------------------------------------------------
+    /// Install any binaries that need to be installed.
+    ///
+    /// This function does nothing when debugging on the host system.
+    /// When connected to remote platforms, the target's main executable
+    /// and any modules that have their remote install path set will be
+    /// installed on the remote platform. If the main executable doesn't
+    /// have an install location set, it will be installed in the remote
+    /// platform's working directory.
+    ///
+    /// @return
+    ///     An error describing anything that went wrong during
+    ///     installation.
+    //------------------------------------------------------------------
+    SBError
+    Install();
+    
+    //------------------------------------------------------------------
+    /// Launch a new process.
+    ///
+    /// Launch a new process by spawning a new process using the
+    /// target object's executable module's file as the file to launch.
+    /// Arguments are given in \a argv, and the environment variables
+    /// are in \a envp. Standard input and output files can be
+    /// optionally re-directed to \a stdin_path, \a stdout_path, and
+    /// \a stderr_path.
+    ///
+    /// @param[in] listener
+    ///     An optional listener that will receive all process events.
+    ///     If \a listener is valid then \a listener will listen to all
+    ///     process events. If not valid, then this target's debugger
+    ///     (SBTarget::GetDebugger()) will listen to all process events. 
+    ///
+    /// @param[in] argv
+    ///     The argument array.
+    ///
+    /// @param[in] envp
+    ///     The environment array.
+    ///
+    /// @param[in] launch_flags
+    ///     Flags to modify the launch (@see lldb::LaunchFlags)
+    ///
+    /// @param[in] stdin_path
+    ///     The path to use when re-directing the STDIN of the new
+    ///     process. If all stdXX_path arguments are NULL, a pseudo
+    ///     terminal will be used.
+    ///
+    /// @param[in] stdout_path
+    ///     The path to use when re-directing the STDOUT of the new
+    ///     process. If all stdXX_path arguments are NULL, a pseudo
+    ///     terminal will be used.
+    ///
+    /// @param[in] stderr_path
+    ///     The path to use when re-directing the STDERR of the new
+    ///     process. If all stdXX_path arguments are NULL, a pseudo
+    ///     terminal will be used.
+    ///
+    /// @param[in] working_directory
+    ///     The working directory to have the child process run in
+    ///
+    /// @param[in] launch_flags
+    ///     Some launch options specified by logical OR'ing 
+    ///     lldb::LaunchFlags enumeration values together.
+    ///
+    /// @param[in] stop_at_entry
+    ///     If false do not stop the inferior at the entry point.
+    ///
+    /// @param[out] error
+    ///     An error object. Contains the reason if there is some failure.
+    ///
+    /// @return
+    ///      A process object for the newly created process.
+    //------------------------------------------------------------------
+    lldb::SBProcess
+    Launch (SBListener &listener, 
+            char const **argv,
+            char const **envp,
+            const char *stdin_path,
+            const char *stdout_path,
+            const char *stderr_path,
+            const char *working_directory,
+            uint32_t launch_flags,   // See LaunchFlags
+            bool stop_at_entry,
+            lldb::SBError& error);
+            
+    
+    //------------------------------------------------------------------
+    /// Launch a new process with sensible defaults.
+    ///
+    /// @param[in] argv
+    ///     The argument array.
+    ///
+    /// @param[in] envp
+    ///     The environment array.
+    ///
+    /// @param[in] working_directory
+    ///     The working directory to have the child process run in
+    ///
+    /// Default: listener
+    ///     Set to the target's debugger (SBTarget::GetDebugger())
+    ///
+    /// Default: launch_flags
+    ///     Empty launch flags
+    ///
+    /// Default: stdin_path
+    /// Default: stdout_path
+    /// Default: stderr_path
+    ///     A pseudo terminal will be used.
+    ///
+    /// @return
+    ///      A process object for the newly created process.
+    //------------------------------------------------------------------
+    SBProcess
+    LaunchSimple (const char **argv, 
+                  const char **envp,
+                  const char *working_directory);
+    
+    SBProcess
+    Launch (SBLaunchInfo &launch_info, SBError& error);
+    
+    SBProcess
+    LoadCore (const char *core_file);
+
+    SBProcess
+    Attach (SBAttachInfo &attach_info, SBError& error);
+
+    //------------------------------------------------------------------
+    /// Attach to process with pid.
+    ///
+    /// @param[in] listener
+    ///     An optional listener that will receive all process events.
+    ///     If \a listener is valid then \a listener will listen to all
+    ///     process events. If not valid, then this target's debugger
+    ///     (SBTarget::GetDebugger()) will listen to all process events.
+    ///
+    /// @param[in] pid
+    ///     The process ID to attach to.
+    ///
+    /// @param[out] error
+    ///     An error explaining what went wrong if attach fails.
+    ///
+    /// @return
+    ///      A process object for the attached process.
+    //------------------------------------------------------------------
+    lldb::SBProcess
+    AttachToProcessWithID (SBListener &listener,
+                           lldb::pid_t pid,
+                           lldb::SBError& error);
+
+#if defined(__APPLE__)
+    // We need to keep this around for a build or two since Xcode links
+    // to the 32 bit version of this function. We will take it out soon.
+    lldb::SBProcess
+    AttachToProcessWithID (SBListener &listener,
+                           ::pid_t pid,           // 32 bit int process ID
+                           lldb::SBError& error); // DEPRECATED 
+#endif
+    //------------------------------------------------------------------
+    /// Attach to process with name.
+    ///
+    /// @param[in] listener
+    ///     An optional listener that will receive all process events.
+    ///     If \a listener is valid then \a listener will listen to all
+    ///     process events. If not valid, then this target's debugger
+    ///     (SBTarget::GetDebugger()) will listen to all process events.
+    ///
+    /// @param[in] name
+    ///     Basename of process to attach to.
+    ///
+    /// @param[in] wait_for
+    ///     If true wait for a new instance of 'name' to be launched.
+    ///
+    /// @param[out] error
+    ///     An error explaining what went wrong if attach fails.
+    ///
+    /// @return
+    ///      A process object for the attached process.
+    //------------------------------------------------------------------
+    lldb::SBProcess
+    AttachToProcessWithName (SBListener &listener,
+                             const char *name,
+                             bool wait_for,
+                             lldb::SBError& error);
+
+    //------------------------------------------------------------------
+    /// Connect to a remote debug server with url.
+    ///
+    /// @param[in] listener
+    ///     An optional listener that will receive all process events.
+    ///     If \a listener is valid then \a listener will listen to all
+    ///     process events. If not valid, then this target's debugger
+    ///     (SBTarget::GetDebugger()) will listen to all process events.
+    ///
+    /// @param[in] url
+    ///     The url to connect to, e.g., 'connect://localhost:12345'.
+    ///
+    /// @param[in] plugin_name
+    ///     The plugin name to be used; can be NULL.
+    ///
+    /// @param[out] error
+    ///     An error explaining what went wrong if the connect fails.
+    ///
+    /// @return
+    ///      A process object for the connected process.
+    //------------------------------------------------------------------
+    lldb::SBProcess
+    ConnectRemote (SBListener &listener,
+                   const char *url,
+                   const char *plugin_name,
+                   SBError& error);
+    
+    lldb::SBFileSpec
+    GetExecutable ();
+
+    bool
+    AddModule (lldb::SBModule &module);
+
+    lldb::SBModule
+    AddModule (const char *path,
+               const char *triple,
+               const char *uuid);
+
+    lldb::SBModule
+    AddModule (const char *path,
+               const char *triple,
+               const char *uuid_cstr,
+               const char *symfile);
+    
+    lldb::SBModule
+    AddModule (const SBModuleSpec &module_spec);
+
+    uint32_t
+    GetNumModules () const;
+
+    lldb::SBModule
+    GetModuleAtIndex (uint32_t idx);
+
+    bool
+    RemoveModule (lldb::SBModule module);
+
+    lldb::SBDebugger
+    GetDebugger() const;
+
+    lldb::SBModule
+    FindModule (const lldb::SBFileSpec &file_spec);
+
+    lldb::ByteOrder
+    GetByteOrder ();
+
+    uint32_t
+    GetAddressByteSize();
+
+    const char *
+    GetTriple ();
+
+    //------------------------------------------------------------------
+    /// Architecture data byte width accessor
+    ///
+    /// @return
+    /// The size in 8-bit (host) bytes of a minimum addressable
+    /// unit from the Architecture's data bus
+    //------------------------------------------------------------------
+    uint32_t
+    GetDataByteSize ();
+
+    //------------------------------------------------------------------
+    /// Architecture code byte width accessor
+    ///
+    /// @return
+    /// The size in 8-bit (host) bytes of a minimum addressable
+    /// unit from the Architecture's code bus
+    //------------------------------------------------------------------
+    uint32_t
+    GetCodeByteSize ();
+
+    //------------------------------------------------------------------
+    /// Set the base load address for a module section.
+    ///
+    /// @param[in] section
+    ///     The section whose base load address will be set within this
+    ///     target.
+    ///
+    /// @param[in] section_base_addr
+    ///     The base address for the section.
+    ///
+    /// @return
+    ///      An error to indicate success, fail, and any reason for 
+    ///     failure.
+    //------------------------------------------------------------------
+    lldb::SBError
+    SetSectionLoadAddress (lldb::SBSection section,
+                           lldb::addr_t section_base_addr);
+    
+    //------------------------------------------------------------------
+    /// Clear the base load address for a module section.
+    ///
+    /// @param[in] section
+    ///     The section whose base load address will be cleared within
+    ///     this target.
+    ///
+    /// @return
+    ///      An error to indicate success, fail, and any reason for 
+    ///     failure.
+    //------------------------------------------------------------------
+    lldb::SBError
+    ClearSectionLoadAddress (lldb::SBSection section);
+    
+    //------------------------------------------------------------------
+    /// Slide all file addresses for all module sections so that \a module
+    /// appears to loaded at these slide addresses.
+    /// 
+    /// When you need all sections within a module to be loaded at a 
+    /// rigid slide from the addresses found in the module object file,
+    /// this function will allow you to easily and quickly slide all
+    /// module sections.
+    ///
+    /// @param[in] module
+    ///     The module to load.
+    ///
+    /// @param[in] sections_offset
+    ///     An offset that will be applied to all section file addresses
+    ///     (the virtual addresses found in the object file itself).
+    ///
+    /// @return
+    ///     An error to indicate success, fail, and any reason for 
+    ///     failure.
+    //------------------------------------------------------------------
+    lldb::SBError
+    SetModuleLoadAddress (lldb::SBModule module,
+                          int64_t sections_offset);
+    
+
+    //------------------------------------------------------------------
+    /// Clear the section base load addresses for all sections in a module.
+    /// 
+    /// @param[in] module
+    ///     The module to unload.
+    ///
+    /// @return
+    ///     An error to indicate success, fail, and any reason for 
+    ///     failure.
+    //------------------------------------------------------------------
+    lldb::SBError
+    ClearModuleLoadAddress (lldb::SBModule module);
+
+    //------------------------------------------------------------------
+    /// Find functions by name.
+    ///
+    /// @param[in] name
+    ///     The name of the function we are looking for.
+    ///
+    /// @param[in] name_type_mask
+    ///     A logical OR of one or more FunctionNameType enum bits that
+    ///     indicate what kind of names should be used when doing the
+    ///     lookup. Bits include fully qualified names, base names,
+    ///     C++ methods, or ObjC selectors. 
+    ///     See FunctionNameType for more details.
+    ///
+    /// @return
+    ///     A lldb::SBSymbolContextList that gets filled in with all of 
+    ///     the symbol contexts for all the matches.
+    //------------------------------------------------------------------
+    lldb::SBSymbolContextList
+    FindFunctions (const char *name, 
+                   uint32_t name_type_mask = lldb::eFunctionNameTypeAny);
+
+    //------------------------------------------------------------------
+    /// Find global and static variables by name.
+    ///
+    /// @param[in] name
+    ///     The name of the global or static variable we are looking
+    ///     for.
+    ///
+    /// @param[in] max_matches
+    ///     Allow the number of matches to be limited to \a max_matches.
+    ///
+    /// @return
+    ///     A list of matched variables in an SBValueList.
+    //------------------------------------------------------------------
+    lldb::SBValueList
+    FindGlobalVariables (const char *name, 
+                         uint32_t max_matches);
+
+    //------------------------------------------------------------------
+    /// Find the first global (or static) variable by name.
+    ///
+    /// @param[in] name
+    ///     The name of the global or static variable we are looking
+    ///     for.
+    ///
+    /// @return
+    ///     An SBValue that gets filled in with the found variable (if any).
+    //------------------------------------------------------------------
+    lldb::SBValue
+    FindFirstGlobalVariable (const char* name);
+
+    //------------------------------------------------------------------
+    /// Find global and static variables by pattern.
+    ///
+    /// @param[in] name
+    ///     The pattern to search for global or static variables
+    ///
+    /// @param[in] max_matches
+    ///     Allow the number of matches to be limited to \a max_matches.
+    /// 
+    /// @param[in] matchtype
+    ///     The match type to use.    
+    ///
+    /// @return
+    ///     A list of matched variables in an SBValueList.
+    //------------------------------------------------------------------
+    lldb::SBValueList
+        FindGlobalVariables(const char *name,
+                            uint32_t max_matches,
+                            MatchType matchtype);
+    
+    //------------------------------------------------------------------
+    /// Find global functions by their name with pattern matching.
+    ///
+    /// @param[in] name
+    ///     The pattern to search for global or static variables
+    ///
+    /// @param[in] max_matches
+    ///     Allow the number of matches to be limited to \a max_matches.
+    /// 
+    /// @param[in] matchtype
+    ///     The match type to use.    
+    ///
+    /// @return
+    ///     A list of matched variables in an SBValueList.
+    //------------------------------------------------------------------
+    lldb::SBSymbolContextList
+        FindGlobalFunctions(const char *name,
+                           uint32_t max_matches,
+                           MatchType matchtype);
+
+    void
+    Clear ();
+
+    //------------------------------------------------------------------
+    /// Resolve a current file address into a section offset address.
+    ///
+    /// @param[in] file_addr
+    ///
+    /// @return
+    ///     An SBAddress which will be valid if...
+    //------------------------------------------------------------------
+    lldb::SBAddress
+    ResolveFileAddress (lldb::addr_t file_addr);
+
+    //------------------------------------------------------------------
+    /// Resolve a current load address into a section offset address.
+    ///
+    /// @param[in] vm_addr
+    ///     A virtual address from the current process state that is to
+    ///     be translated into a section offset address.
+    ///
+    /// @return
+    ///     An SBAddress which will be valid if \a vm_addr was
+    ///     successfully resolved into a section offset address, or an
+    ///     invalid SBAddress if \a vm_addr doesn't resolve to a section
+    ///     in a module.
+    //------------------------------------------------------------------
+    lldb::SBAddress
+    ResolveLoadAddress (lldb::addr_t vm_addr);
+
+    //------------------------------------------------------------------
+    /// Resolve a current load address into a section offset address
+    /// using the process stop ID to identify a time in the past.
+    ///
+    /// @param[in] stop_id
+    ///     Each time a process stops, the process stop ID integer gets
+    ///     incremented. These stop IDs are used to identify past times
+    ///     and can be used in history objects as a cheap way to store
+    ///     the time at which the sample was taken. Specifying
+    ///     UINT32_MAX will always resolve the address using the
+    ///     currently loaded sections.
+    ///
+    /// @param[in] vm_addr
+    ///     A virtual address from the current process state that is to
+    ///     be translated into a section offset address.
+    ///
+    /// @return
+    ///     An SBAddress which will be valid if \a vm_addr was
+    ///     successfully resolved into a section offset address, or an
+    ///     invalid SBAddress if \a vm_addr doesn't resolve to a section
+    ///     in a module.
+    //------------------------------------------------------------------
+    lldb::SBAddress
+    ResolvePastLoadAddress (uint32_t stop_id, lldb::addr_t vm_addr);
+
+    SBSymbolContext
+    ResolveSymbolContextForAddress (const SBAddress& addr, 
+                                    uint32_t resolve_scope);
+
+    //------------------------------------------------------------------
+    /// Read target memory. If a target process is running then memory  
+    /// is read from here. Otherwise the memory is read from the object
+    /// files. For a target whose bytes are sized as a multiple of host
+    /// bytes, the data read back will preserve the target's byte order.
+    ///
+    /// @param[in] addr
+    ///     A target address to read from. 
+    ///
+    /// @param[out] buf
+    ///     The buffer to read memory into. 
+    ///
+    /// @param[in] size
+    ///     The maximum number of host bytes to read in the buffer passed
+    ///     into this call
+    ///
+    /// @param[out] error
+    ///     Error information is written here if the memory read fails.
+    ///
+    /// @return
+    ///     The amount of data read in host bytes.
+    //------------------------------------------------------------------
+    size_t
+    ReadMemory (const SBAddress addr, void *buf, size_t size, lldb::SBError &error);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByLocation (const char *file, uint32_t line);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByLocation (const lldb::SBFileSpec &file_spec, uint32_t line);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByName (const char *symbol_name, const char *module_name = NULL);
+
+    // This version uses name_type_mask = eFunctionNameTypeAuto
+    lldb::SBBreakpoint
+    BreakpointCreateByName (const char *symbol_name, 
+                            const SBFileSpecList &module_list, 
+                            const SBFileSpecList &comp_unit_list);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByName (const char *symbol_name,
+                            uint32_t name_type_mask,           // Logical OR one or more FunctionNameType enum bits
+                            const SBFileSpecList &module_list, 
+                            const SBFileSpecList &comp_unit_list);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByNames (const char *symbol_name[],
+                             uint32_t num_names,
+                             uint32_t name_type_mask,           // Logical OR one or more FunctionNameType enum bits
+                             const SBFileSpecList &module_list,
+                             const SBFileSpecList &comp_unit_list);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByRegex (const char *symbol_name_regex, const char *module_name = NULL);
+    
+    lldb::SBBreakpoint
+    BreakpointCreateByRegex (const char *symbol_name_regex, 
+                             const SBFileSpecList &module_list, 
+                             const SBFileSpecList &comp_unit_list);
+    
+    lldb::SBBreakpoint
+    BreakpointCreateBySourceRegex (const char *source_regex, 
+                                   const SBFileSpec &source_file,
+                                   const char *module_name = NULL);
+
+    lldb::SBBreakpoint
+    BreakpointCreateBySourceRegex (const char *source_regex,
+                                   const SBFileSpecList &module_list,
+                                   const SBFileSpecList &source_file);
+    
+    lldb::SBBreakpoint
+    BreakpointCreateForException  (lldb::LanguageType language,
+                                   bool catch_bp,
+                                   bool throw_bp);
+
+    lldb::SBBreakpoint
+    BreakpointCreateByAddress (addr_t address);
+
+    uint32_t
+    GetNumBreakpoints () const;
+
+    lldb::SBBreakpoint
+    GetBreakpointAtIndex (uint32_t idx) const;
+
+    bool
+    BreakpointDelete (break_id_t break_id);
+
+    lldb::SBBreakpoint
+    FindBreakpointByID (break_id_t break_id);
+
+    bool
+    EnableAllBreakpoints ();
+
+    bool
+    DisableAllBreakpoints ();
+
+    bool
+    DeleteAllBreakpoints ();
+
+    uint32_t
+    GetNumWatchpoints () const;
+
+    lldb::SBWatchpoint
+    GetWatchpointAtIndex (uint32_t idx) const;
+
+    bool
+    DeleteWatchpoint (lldb::watch_id_t watch_id);
+
+    lldb::SBWatchpoint
+    FindWatchpointByID (lldb::watch_id_t watch_id);
+
+    lldb::SBWatchpoint
+    WatchAddress (lldb::addr_t addr, size_t size, bool read, bool write, SBError& error);
+
+    bool
+    EnableAllWatchpoints ();
+
+    bool
+    DisableAllWatchpoints ();
+
+    bool
+    DeleteAllWatchpoints ();
+
+    lldb::SBBroadcaster
+    GetBroadcaster () const;
+    
+    lldb::SBType
+    FindFirstType (const char* type);
+    
+    lldb::SBTypeList
+    FindTypes (const char* type);
+    
+    lldb::SBType
+    GetBasicType(lldb::BasicType type);
+    
+    lldb::SBValue
+    CreateValueFromAddress (const char *name, lldb::SBAddress addr, lldb::SBType type);
+
+    lldb::SBValue
+    CreateValueFromData (const char *name, lldb::SBData data, lldb::SBType type);
+
+    lldb::SBValue
+    CreateValueFromExpression (const char *name, const char* expr);
+    
+    SBSourceManager
+    GetSourceManager();
+    
+    lldb::SBInstructionList
+    ReadInstructions (lldb::SBAddress base_addr, uint32_t count);
+
+    lldb::SBInstructionList
+    ReadInstructions (lldb::SBAddress base_addr, uint32_t count, const char *flavor_string);
+
+    lldb::SBInstructionList
+    GetInstructions (lldb::SBAddress base_addr, const void *buf, size_t size);
+    
+    // The "WithFlavor" is necessary to keep SWIG from getting confused about overloaded arguments when
+    // using the buf + size -> Python Object magic.
+    
+    lldb::SBInstructionList
+    GetInstructionsWithFlavor (lldb::SBAddress base_addr,  const char *flavor_string, const void *buf, size_t size);
+    
+    lldb::SBInstructionList
+    GetInstructions (lldb::addr_t base_addr, const void *buf, size_t size);
+
+    lldb::SBInstructionList
+    GetInstructionsWithFlavor (lldb::addr_t base_addr, const char *flavor_string, const void *buf, size_t size);
+
+    lldb::SBSymbolContextList
+    FindSymbols (const char *name,
+                 lldb::SymbolType type = eSymbolTypeAny);
+
+    bool
+    operator == (const lldb::SBTarget &rhs) const;
+
+    bool
+    operator != (const lldb::SBTarget &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description, lldb::DescriptionLevel description_level);
+
+    lldb::SBValue
+    EvaluateExpression (const char *expr, const SBExpressionOptions &options);
+
+    lldb::addr_t
+    GetStackRedZoneSize();
+
+    lldb::SBLaunchInfo
+    GetLaunchInfo () const;
+
+    void
+    SetLaunchInfo (const lldb::SBLaunchInfo &launch_info);
+    
+protected:
+    friend class SBAddress;
+    friend class SBBlock;
+    friend class SBDebugger;
+    friend class SBExecutionContext;
+    friend class SBFunction;
+    friend class SBInstruction;
+    friend class SBModule;
+    friend class SBProcess;
+    friend class SBSection;
+    friend class SBSourceManager;
+    friend class SBSymbol;
+    friend class SBValue;
+
+    //------------------------------------------------------------------
+    // Constructors are private, use static Target::Create function to
+    // create an instance of this class.
+    //------------------------------------------------------------------
+
+    lldb::TargetSP
+    GetSP () const;
+
+    void
+    SetSP (const lldb::TargetSP& target_sp);
+
+
+private:
+    //------------------------------------------------------------------
+    // For Target only
+    //------------------------------------------------------------------
+
+    lldb::TargetSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBTarget_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThread.h b/kcov-38/external/lldb/include/lldb/API/SBThread.h
new file mode 100644
index 000000000000..2c45fa8d5120
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBThread.h
@@ -0,0 +1,259 @@
+//===-- SBThread.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBThread_h_
+#define LLDB_SBThread_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+
+namespace lldb {
+
+class SBFrame;
+
+class LLDB_API SBThread
+{
+public:
+    enum
+    {
+        eBroadcastBitStackChanged           = (1 << 0),
+        eBroadcastBitThreadSuspended        = (1 << 1),
+        eBroadcastBitThreadResumed          = (1 << 2),
+        eBroadcastBitSelectedFrameChanged   = (1 << 3),
+        eBroadcastBitThreadSelected         = (1 << 4)
+    };
+
+    static const char *
+    GetBroadcasterClassName ();
+    
+    SBThread ();
+
+    SBThread (const lldb::SBThread &thread);
+    
+    SBThread (const lldb::ThreadSP& lldb_object_sp);
+
+   ~SBThread();
+
+    lldb::SBQueue
+    GetQueue () const;
+
+    bool
+    IsValid() const;
+
+    void
+    Clear ();
+
+    lldb::StopReason
+    GetStopReason();
+
+    /// Get the number of words associated with the stop reason.
+    /// See also GetStopReasonDataAtIndex().
+    size_t
+    GetStopReasonDataCount();
+
+    //--------------------------------------------------------------------------
+    /// Get information associated with a stop reason.
+    ///
+    /// Breakpoint stop reasons will have data that consists of pairs of 
+    /// breakpoint IDs followed by the breakpoint location IDs (they always come
+    /// in pairs).
+    ///
+    /// Stop Reason              Count Data Type
+    /// ======================== ===== =========================================
+    /// eStopReasonNone          0
+    /// eStopReasonTrace         0
+    /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
+    /// eStopReasonWatchpoint    1     watchpoint id
+    /// eStopReasonSignal        1     unix signal number
+    /// eStopReasonException     N     exception data
+    /// eStopReasonExec          0
+    /// eStopReasonPlanComplete  0
+    //--------------------------------------------------------------------------
+    uint64_t
+    GetStopReasonDataAtIndex(uint32_t idx);
+    
+    bool
+    GetStopReasonExtendedInfoAsJSON (lldb::SBStream &stream);
+    
+    size_t
+    GetStopDescription (char *dst, size_t dst_len);
+    
+    SBValue
+    GetStopReturnValue ();
+
+    lldb::tid_t
+    GetThreadID () const;
+
+    uint32_t
+    GetIndexID () const;
+
+    const char *
+    GetName () const;
+
+    const char *
+    GetQueueName() const;
+
+    lldb::queue_id_t
+    GetQueueID() const;
+
+    bool
+    GetInfoItemByPathAsString ( const char *path, SBStream &strm);
+
+    void
+    StepOver (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
+
+    void
+    StepInto (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
+
+    void
+    StepInto (const char *target_name, lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
+    
+    void
+    StepOut ();
+
+    void
+    StepOutOfFrame (lldb::SBFrame &frame);
+
+    void
+    StepInstruction(bool step_over);
+
+    SBError
+    StepOverUntil (lldb::SBFrame &frame, 
+                   lldb::SBFileSpec &file_spec, 
+                   uint32_t line);
+
+    SBError
+    StepUsingScriptedThreadPlan (const char *script_class_name);
+
+    SBError
+    JumpToLine (lldb::SBFileSpec &file_spec, uint32_t line);
+
+    void
+    RunToAddress (lldb::addr_t addr);
+    
+    SBError
+    ReturnFromFrame (SBFrame &frame, SBValue &return_value);
+
+    //--------------------------------------------------------------------------
+    /// LLDB currently supports process centric debugging which means when any
+    /// thread in a process stops, all other threads are stopped. The Suspend()
+    /// call here tells our process to suspend a thread and not let it run when
+    /// the other threads in a process are allowed to run. So when 
+    /// SBProcess::Continue() is called, any threads that aren't suspended will
+    /// be allowed to run. If any of the SBThread functions for stepping are 
+    /// called (StepOver, StepInto, StepOut, StepInstruction, RunToAddress), the
+    /// thread will not be allowed to run and these functions will simply return.
+    ///
+    /// Eventually we plan to add support for thread centric debugging where
+    /// each thread is controlled individually and each thread would broadcast
+    /// its state, but we haven't implemented this yet.
+    /// 
+    /// Likewise the SBThread::Resume() call will again allow the thread to run
+    /// when the process is continued.
+    ///
+    /// Suspend() and Resume() functions are not currently reference counted, if
+    /// anyone has the need for them to be reference counted, please let us
+    /// know.
+    //--------------------------------------------------------------------------
+    bool
+    Suspend();
+    
+    bool
+    Resume ();
+    
+    bool
+    IsSuspended();
+
+    bool
+    IsStopped();
+
+    uint32_t
+    GetNumFrames ();
+
+    lldb::SBFrame
+    GetFrameAtIndex (uint32_t idx);
+
+    lldb::SBFrame
+    GetSelectedFrame ();
+
+    lldb::SBFrame
+    SetSelectedFrame (uint32_t frame_idx);
+    
+    static bool
+    EventIsThreadEvent (const SBEvent &event);
+    
+    static SBFrame
+    GetStackFrameFromEvent (const SBEvent &event);
+    
+    static SBThread
+    GetThreadFromEvent (const SBEvent &event);
+
+    lldb::SBProcess
+    GetProcess ();
+
+    const lldb::SBThread &
+    operator = (const lldb::SBThread &rhs);
+
+    bool
+    operator == (const lldb::SBThread &rhs) const;
+
+    bool
+    operator != (const lldb::SBThread &rhs) const;
+
+    bool
+    GetDescription (lldb::SBStream &description) const;
+    
+    bool
+    GetStatus (lldb::SBStream &status) const;
+
+    SBThread
+    GetExtendedBacktraceThread (const char *type);
+
+    uint32_t
+    GetExtendedBacktraceOriginatingIndexID ();
+
+    bool
+    SafeToCallFunctions ();
+
+#ifndef SWIG
+    lldb_private::Thread *
+    operator->();
+
+    lldb_private::Thread *
+    get();
+
+#endif
+
+protected:
+    friend class SBBreakpoint;
+    friend class SBBreakpointLocation;
+    friend class SBExecutionContext;
+    friend class SBFrame;
+    friend class SBProcess;
+    friend class SBDebugger;
+    friend class SBValue;
+    friend class lldb_private::QueueImpl;
+    friend class SBQueueItem;
+
+    void
+    SetThread (const lldb::ThreadSP& lldb_object_sp);
+
+#ifndef SWIG
+    SBError
+    ResumeNewPlan (lldb_private::ExecutionContext &exe_ctx, lldb_private::ThreadPlan *new_plan);
+#endif
+
+private:
+    lldb::ExecutionContextRefSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBThread_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h b/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
new file mode 100644
index 000000000000..996ee3cd22aa
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
@@ -0,0 +1,68 @@
+//===-- SBThreadCollection.h ------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBThreadCollection_h_
+#define LLDB_SBThreadCollection_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+    
+class LLDB_API SBThreadCollection
+{
+public:
+    
+    SBThreadCollection ();
+    
+    SBThreadCollection (const SBThreadCollection &rhs);
+    
+    const SBThreadCollection &
+    operator = (const SBThreadCollection &rhs);
+    
+    ~SBThreadCollection ();
+    
+    bool
+    IsValid () const;
+    
+    size_t
+    GetSize ();
+    
+    lldb::SBThread
+    GetThreadAtIndex (size_t idx);
+    
+protected:
+    
+    // Mimic shared pointer...
+    lldb_private::ThreadCollection *
+    get() const;
+    
+    lldb_private::ThreadCollection *
+    operator->() const;
+    
+    lldb::ThreadCollectionSP &
+    operator*();
+    
+    const lldb::ThreadCollectionSP &
+    operator*() const;
+    
+    SBThreadCollection (const lldb::ThreadCollectionSP &threads);
+
+    void
+    SetOpaque (const lldb::ThreadCollectionSP &threads);
+    
+private:
+    friend class SBProcess;
+    
+    lldb::ThreadCollectionSP m_opaque_sp;
+};
+    
+    
+} // namespace lldb
+
+#endif // LLDB_SBThreadCollection_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h b/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
new file mode 100644
index 000000000000..9cc0d0b89bb5
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
@@ -0,0 +1,129 @@
+//===-- SBThread.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBThreadPlan_h_
+#define LLDB_SBThreadPlan_h_
+
+#include "lldb/API/SBDefines.h"
+
+#include <stdio.h>
+
+namespace lldb {
+
+class LLDB_API SBThreadPlan
+{
+
+friend class lldb_private::ThreadPlan;
+
+public:
+    SBThreadPlan ();
+
+    SBThreadPlan (const lldb::SBThreadPlan &threadPlan);
+    
+    SBThreadPlan (const lldb::ThreadPlanSP& lldb_object_sp);
+
+    SBThreadPlan (lldb::SBThread &thread, const char *class_name);
+
+   ~SBThreadPlan ();
+
+    bool
+    IsValid() const;
+
+    void
+    Clear ();
+
+    lldb::StopReason
+    GetStopReason();
+
+    /// Get the number of words associated with the stop reason.
+    /// See also GetStopReasonDataAtIndex().
+    size_t
+    GetStopReasonDataCount();
+
+    //--------------------------------------------------------------------------
+    /// Get information associated with a stop reason.
+    ///
+    /// Breakpoint stop reasons will have data that consists of pairs of 
+    /// breakpoint IDs followed by the breakpoint location IDs (they always come
+    /// in pairs).
+    ///
+    /// Stop Reason              Count Data Type
+    /// ======================== ===== =========================================
+    /// eStopReasonNone          0
+    /// eStopReasonTrace         0
+    /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
+    /// eStopReasonWatchpoint    1     watchpoint id
+    /// eStopReasonSignal        1     unix signal number
+    /// eStopReasonException     N     exception data
+    /// eStopReasonExec          0
+    /// eStopReasonPlanComplete  0
+    //--------------------------------------------------------------------------
+    uint64_t
+    GetStopReasonDataAtIndex(uint32_t idx);
+
+    SBThread
+    GetThread () const;
+
+    const lldb::SBThreadPlan &
+    operator = (const lldb::SBThreadPlan &rhs);
+
+    bool
+    GetDescription (lldb::SBStream &description) const;
+
+    void
+    SetPlanComplete (bool success);
+
+    bool
+    IsPlanComplete();
+
+    bool
+    IsValid();
+
+    // This section allows an SBThreadPlan to push another of the common types of plans...
+    SBThreadPlan
+    QueueThreadPlanForStepOverRange (SBAddress &start_address,
+                                     lldb::addr_t range_size);
+
+    SBThreadPlan
+    QueueThreadPlanForStepInRange (SBAddress &start_address,
+                                   lldb::addr_t range_size);
+
+    SBThreadPlan
+    QueueThreadPlanForStepOut (uint32_t frame_idx_to_step_to, bool first_insn = false);
+
+    SBThreadPlan
+    QueueThreadPlanForRunToAddress (SBAddress address);
+
+#ifndef SWIG
+    lldb_private::ThreadPlan *
+    get();
+#endif
+
+protected:
+    friend class SBBreakpoint;
+    friend class SBBreakpointLocation;
+    friend class SBFrame;
+    friend class SBProcess;
+    friend class SBDebugger;
+    friend class SBValue;
+    friend class lldb_private::QueueImpl;
+    friend class SBQueueItem;
+
+#ifndef SWIG
+    void
+    SetThreadPlan (const lldb::ThreadPlanSP& lldb_object_sp);
+#endif
+
+private:
+    lldb::ThreadPlanSP m_opaque_sp;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBThreadPlan_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBType.h b/kcov-38/external/lldb/include/lldb/API/SBType.h
new file mode 100644
index 000000000000..01f0c6afc795
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBType.h
@@ -0,0 +1,333 @@
+//===-- SBType.h ------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBType_h_
+#define LLDB_SBType_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class SBTypeList;    
+
+class LLDB_API SBTypeMember
+{
+public:
+    SBTypeMember ();
+    
+    SBTypeMember (const lldb::SBTypeMember& rhs);
+    
+    ~SBTypeMember();
+
+    lldb::SBTypeMember&
+    operator = (const lldb::SBTypeMember& rhs);
+
+    bool
+    IsValid() const;
+    
+    const char *
+    GetName ();
+    
+    lldb::SBType
+    GetType ();
+    
+    uint64_t
+    GetOffsetInBytes();
+    
+    uint64_t
+    GetOffsetInBits();
+
+    bool
+    IsBitfield();
+    
+    uint32_t
+    GetBitfieldSizeInBits();
+
+    bool
+    GetDescription (lldb::SBStream &description, 
+                    lldb::DescriptionLevel description_level);
+    
+protected:
+    friend class SBType;
+
+    void
+    reset (lldb_private::TypeMemberImpl *);
+
+    lldb_private::TypeMemberImpl &
+    ref ();
+
+    const lldb_private::TypeMemberImpl &
+    ref () const;
+
+    std::unique_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
+};
+    
+class SBTypeMemberFunction
+{
+public:
+    SBTypeMemberFunction ();
+    
+    SBTypeMemberFunction (const lldb::SBTypeMemberFunction& rhs);
+    
+    ~SBTypeMemberFunction();
+    
+    lldb::SBTypeMemberFunction&
+    operator = (const lldb::SBTypeMemberFunction& rhs);
+    
+    bool
+    IsValid() const;
+    
+    const char *
+    GetName ();
+    
+    lldb::SBType
+    GetType ();
+    
+    lldb::SBType
+    GetReturnType ();
+    
+    uint32_t
+    GetNumberOfArguments ();
+    
+    lldb::SBType
+    GetArgumentTypeAtIndex (uint32_t);
+    
+    lldb::MemberFunctionKind
+    GetKind();
+    
+    bool
+    GetDescription (lldb::SBStream &description,
+                    lldb::DescriptionLevel description_level);
+    
+protected:
+    friend class SBType;
+    
+    void
+    reset (lldb_private::TypeMemberFunctionImpl *);
+    
+    lldb_private::TypeMemberFunctionImpl &
+    ref ();
+    
+    const lldb_private::TypeMemberFunctionImpl &
+    ref () const;
+    
+    lldb::TypeMemberFunctionImplSP m_opaque_sp;
+};
+
+
+class SBType
+{
+public:
+
+    SBType();
+
+    SBType (const lldb::SBType &rhs);
+
+    ~SBType ();
+
+    bool
+    IsValid() const;
+    
+    uint64_t
+    GetByteSize();
+
+    bool
+    IsPointerType();
+    
+    bool
+    IsReferenceType();
+    
+    bool
+    IsFunctionType ();
+    
+    bool
+    IsPolymorphicClass ();
+    
+    bool
+    IsArrayType ();
+    
+    bool
+    IsVectorType ();
+    
+    bool
+    IsTypedefType ();
+    
+    lldb::SBType
+    GetPointerType();
+    
+    lldb::SBType
+    GetPointeeType();
+    
+    lldb::SBType
+    GetReferenceType();
+    
+    lldb::SBType
+    GetTypedefedType();
+
+    lldb::SBType
+    GetDereferencedType();
+
+    lldb::SBType
+    GetUnqualifiedType();
+    
+    lldb::SBType
+    GetArrayElementType ();
+    
+    lldb::SBType
+    GetVectorElementType ();
+
+    lldb::SBType
+    GetCanonicalType();
+    // Get the "lldb::BasicType" enumeration for a type. If a type is not a basic
+    // type eBasicTypeInvalid will be returned
+    lldb::BasicType
+    GetBasicType();
+
+    // The call below confusing and should really be renamed to "CreateBasicType"
+    lldb::SBType
+    GetBasicType(lldb::BasicType type);
+    
+    uint32_t
+    GetNumberOfFields ();
+    
+    uint32_t
+    GetNumberOfDirectBaseClasses ();
+
+    uint32_t
+    GetNumberOfVirtualBaseClasses ();
+    
+    lldb::SBTypeMember
+    GetFieldAtIndex (uint32_t idx);
+    
+    lldb::SBTypeMember
+    GetDirectBaseClassAtIndex (uint32_t idx);
+
+    lldb::SBTypeMember
+    GetVirtualBaseClassAtIndex (uint32_t idx);
+
+    lldb::SBTypeEnumMemberList
+    GetEnumMembers();
+
+    uint32_t
+    GetNumberOfTemplateArguments ();
+    
+    lldb::SBType
+    GetTemplateArgumentType (uint32_t idx);
+
+    lldb::TemplateArgumentKind
+    GetTemplateArgumentKind (uint32_t idx);
+
+    lldb::SBType
+    GetFunctionReturnType ();
+
+    lldb::SBTypeList
+    GetFunctionArgumentTypes ();
+    
+    uint32_t
+    GetNumberOfMemberFunctions ();
+    
+    lldb::SBTypeMemberFunction
+    GetMemberFunctionAtIndex (uint32_t idx);
+
+    const char*
+    GetName();
+    
+    const char *
+    GetDisplayTypeName ();
+    
+    lldb::TypeClass
+    GetTypeClass ();
+    
+    bool
+    IsTypeComplete ();
+    
+    uint32_t
+    GetTypeFlags ();
+
+    bool
+    GetDescription (lldb::SBStream &description, 
+                    lldb::DescriptionLevel description_level);
+
+    lldb::SBType &
+    operator = (const lldb::SBType &rhs);
+    
+    bool
+    operator == (lldb::SBType &rhs);
+    
+    bool
+    operator != (lldb::SBType &rhs);
+    
+protected:
+
+    lldb_private::TypeImpl &
+    ref ();
+    
+    const lldb_private::TypeImpl &
+    ref () const;
+    
+    lldb::TypeImplSP
+    GetSP ();
+
+    void
+    SetSP (const lldb::TypeImplSP &type_impl_sp);    
+
+    lldb::TypeImplSP m_opaque_sp;
+    
+    friend class SBFunction;
+    friend class SBModule;
+    friend class SBTarget;
+    friend class SBTypeEnumMember;
+    friend class SBTypeEnumMemberList;
+    friend class SBTypeNameSpecifier;
+    friend class SBTypeMember;
+    friend class SBTypeMemberFunction;
+    friend class SBTypeList;
+    friend class SBValue;
+        
+    SBType (const lldb_private::ClangASTType &);
+    SBType (const lldb::TypeSP &);
+    SBType (const lldb::TypeImplSP &);
+    
+};
+    
+class SBTypeList
+{
+public:
+    SBTypeList();
+    
+    SBTypeList(const lldb::SBTypeList& rhs);
+    
+    ~SBTypeList();
+
+    lldb::SBTypeList&
+    operator = (const lldb::SBTypeList& rhs);
+    
+    bool
+    IsValid();
+
+    void
+    Append (lldb::SBType type);
+    
+    lldb::SBType
+    GetTypeAtIndex (uint32_t index);
+    
+    uint32_t
+    GetSize();
+    
+    
+private:
+    std::unique_ptr<lldb_private::TypeListImpl> m_opaque_ap;
+    friend class SBModule;
+    friend class SBCompileUnit;
+};
+    
+
+} // namespace lldb
+
+#endif // LLDB_SBType_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h b/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
new file mode 100644
index 000000000000..30c338b28a46
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
@@ -0,0 +1,168 @@
+//===-- SBTypeCategory.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeCategory_h_
+#define LLDB_SBTypeCategory_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+    
+    class LLDB_API SBTypeCategory
+    {
+    public:
+        
+        SBTypeCategory();
+        
+        SBTypeCategory (const lldb::SBTypeCategory &rhs);
+        
+        ~SBTypeCategory ();
+        
+        bool
+        IsValid() const;
+        
+        bool
+        GetEnabled ();
+        
+        void
+        SetEnabled (bool);
+        
+        const char*
+        GetName();
+        
+        bool
+        GetDescription (lldb::SBStream &description, 
+                        lldb::DescriptionLevel description_level);
+        
+        uint32_t
+        GetNumFormats ();
+        
+        uint32_t
+        GetNumSummaries ();
+        
+        uint32_t
+        GetNumFilters ();
+        
+#ifndef LLDB_DISABLE_PYTHON
+        uint32_t
+        GetNumSynthetics ();
+#endif
+        
+        SBTypeNameSpecifier
+        GetTypeNameSpecifierForFilterAtIndex (uint32_t);
+        
+        SBTypeNameSpecifier
+        GetTypeNameSpecifierForFormatAtIndex (uint32_t);
+        
+        SBTypeNameSpecifier
+        GetTypeNameSpecifierForSummaryAtIndex (uint32_t);
+
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeNameSpecifier
+        GetTypeNameSpecifierForSyntheticAtIndex (uint32_t);
+#endif
+        
+        SBTypeFilter
+        GetFilterForType (SBTypeNameSpecifier);
+
+        SBTypeFormat
+        GetFormatForType (SBTypeNameSpecifier);
+        
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeSummary
+        GetSummaryForType (SBTypeNameSpecifier);
+#endif
+
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeSynthetic
+        GetSyntheticForType (SBTypeNameSpecifier);
+#endif
+        
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeFilter
+        GetFilterAtIndex (uint32_t);
+#endif
+        
+        SBTypeFormat
+        GetFormatAtIndex (uint32_t);
+        
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeSummary
+        GetSummaryAtIndex (uint32_t);
+#endif
+        
+#ifndef LLDB_DISABLE_PYTHON
+        SBTypeSynthetic
+        GetSyntheticAtIndex (uint32_t);
+#endif
+        
+        bool
+        AddTypeFormat (SBTypeNameSpecifier,
+                       SBTypeFormat);
+        
+        bool
+        DeleteTypeFormat (SBTypeNameSpecifier);
+        
+#ifndef LLDB_DISABLE_PYTHON
+        bool
+        AddTypeSummary (SBTypeNameSpecifier,
+                        SBTypeSummary);
+#endif
+        
+        bool
+        DeleteTypeSummary (SBTypeNameSpecifier);
+        
+        bool
+        AddTypeFilter (SBTypeNameSpecifier,
+                       SBTypeFilter);
+        
+        bool
+        DeleteTypeFilter (SBTypeNameSpecifier);
+        
+#ifndef LLDB_DISABLE_PYTHON
+        bool
+        AddTypeSynthetic (SBTypeNameSpecifier,
+                          SBTypeSynthetic);
+        
+        bool
+        DeleteTypeSynthetic (SBTypeNameSpecifier);
+#endif
+        
+        lldb::SBTypeCategory &
+        operator = (const lldb::SBTypeCategory &rhs);
+        
+        bool
+        operator == (lldb::SBTypeCategory &rhs);
+        
+        bool
+        operator != (lldb::SBTypeCategory &rhs);
+        
+    protected:
+        friend class SBDebugger;
+        
+        lldb::TypeCategoryImplSP
+        GetSP ();
+        
+        void
+        SetSP (const lldb::TypeCategoryImplSP &typecategory_impl_sp);    
+        
+        TypeCategoryImplSP m_opaque_sp;
+        
+        SBTypeCategory (const lldb::TypeCategoryImplSP &);
+        
+        SBTypeCategory (const char*);
+        
+        bool
+        IsDefaultCategory();
+        
+    };
+    
+} // namespace lldb
+
+#endif // LLDB_SBTypeCategory_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h b/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
new file mode 100644
index 000000000000..b141ba0a6bb0
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
@@ -0,0 +1,98 @@
+
+//===-- SBTypeEnumMember.h --------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeEnumMember_h_
+#define LLDB_SBTypeEnumMember_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBTypeEnumMember
+{
+public:
+    SBTypeEnumMember ();
+
+    SBTypeEnumMember (const SBTypeEnumMember& rhs);
+
+    ~SBTypeEnumMember();
+
+    SBTypeEnumMember&
+    operator = (const SBTypeEnumMember& rhs);
+
+    bool
+    IsValid() const;
+
+    int64_t
+    GetValueAsSigned();
+
+    uint64_t
+    GetValueAsUnsigned();
+
+    const char *
+    GetName ();
+
+    lldb::SBType
+    GetType ();
+
+    bool
+    GetDescription (lldb::SBStream &description,
+                    lldb::DescriptionLevel description_level);
+
+protected:
+    friend class SBType;
+    friend class SBTypeEnumMemberList;
+
+    void
+    reset (lldb_private::TypeEnumMemberImpl *);
+
+    lldb_private::TypeEnumMemberImpl &
+    ref ();
+
+    const lldb_private::TypeEnumMemberImpl &
+    ref () const;
+
+    lldb::TypeEnumMemberImplSP m_opaque_sp;
+
+    SBTypeEnumMember (const lldb::TypeEnumMemberImplSP &);
+};
+
+class SBTypeEnumMemberList
+{
+public:
+    SBTypeEnumMemberList();
+
+    SBTypeEnumMemberList(const SBTypeEnumMemberList& rhs);
+
+    ~SBTypeEnumMemberList();
+
+    SBTypeEnumMemberList&
+    operator = (const SBTypeEnumMemberList& rhs);
+
+    bool
+    IsValid();
+
+    void
+    Append (SBTypeEnumMember entry);
+
+    SBTypeEnumMember
+    GetTypeEnumMemberAtIndex (uint32_t index);
+
+    uint32_t
+    GetSize();
+
+
+private:
+    std::unique_ptr<lldb_private::TypeEnumMemberListImpl> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif // LLDB_SBTypeEnumMember_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h b/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
new file mode 100644
index 000000000000..f030b6a99b60
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
@@ -0,0 +1,92 @@
+//===-- SBTypeFilter.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeFilter_h_
+#define LLDB_SBTypeFilter_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+    
+    class LLDB_API SBTypeFilter
+    {
+    public:
+        
+        SBTypeFilter();
+        
+        SBTypeFilter (uint32_t options); // see lldb::eTypeOption values
+        
+        SBTypeFilter (const lldb::SBTypeFilter &rhs);
+        
+        ~SBTypeFilter ();
+        
+        bool
+        IsValid() const;
+
+        uint32_t
+        GetNumberOfExpressionPaths ();
+        
+        const char*
+        GetExpressionPathAtIndex (uint32_t i);
+        
+        bool
+        ReplaceExpressionPathAtIndex (uint32_t i, const char* item);
+        
+        void
+        AppendExpressionPath (const char* item);
+        
+        void
+        Clear();
+                
+        uint32_t
+        GetOptions();
+        
+        void
+        SetOptions (uint32_t);
+        
+        bool
+        GetDescription (lldb::SBStream &description, 
+                        lldb::DescriptionLevel description_level);
+        
+        lldb::SBTypeFilter &
+        operator = (const lldb::SBTypeFilter &rhs);
+        
+        bool
+        IsEqualTo (lldb::SBTypeFilter &rhs);
+        
+        bool
+        operator == (lldb::SBTypeFilter &rhs);
+
+        bool
+        operator != (lldb::SBTypeFilter &rhs);
+        
+    protected:
+        friend class SBDebugger;
+        friend class SBTypeCategory;
+        friend class SBValue;
+        
+        lldb::TypeFilterImplSP
+        GetSP ();
+        
+        void
+        SetSP (const lldb::TypeFilterImplSP &typefilter_impl_sp);    
+        
+        lldb::TypeFilterImplSP m_opaque_sp;
+        
+        SBTypeFilter (const lldb::TypeFilterImplSP &);
+        
+        bool
+        CopyOnWrite_Impl();
+        
+    };
+    
+    
+} // namespace lldb
+
+#endif // LLDB_SBTypeFilter_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h b/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
new file mode 100644
index 000000000000..c24641ac15f5
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
@@ -0,0 +1,100 @@
+//===-- SBTypeFormat.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeFormat_h_
+#define LLDB_SBTypeFormat_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBTypeFormat
+{
+public:
+    
+    SBTypeFormat();
+    
+    SBTypeFormat (lldb::Format format,
+                  uint32_t options = 0); // see lldb::eTypeOption values
+
+    SBTypeFormat (const char* type,
+                  uint32_t options = 0); // see lldb::eTypeOption values
+    
+    SBTypeFormat (const lldb::SBTypeFormat &rhs);
+    
+    ~SBTypeFormat ();
+    
+    bool
+    IsValid() const;
+    
+    lldb::Format
+    GetFormat ();
+    
+    const char*
+    GetTypeName ();
+    
+    uint32_t
+    GetOptions();
+    
+    void
+    SetFormat (lldb::Format);
+    
+    void
+    SetTypeName (const char*);
+    
+    void
+    SetOptions (uint32_t);
+    
+    bool
+    GetDescription (lldb::SBStream &description, 
+                    lldb::DescriptionLevel description_level);
+    
+    lldb::SBTypeFormat &
+    operator = (const lldb::SBTypeFormat &rhs);
+    
+    bool
+    IsEqualTo (lldb::SBTypeFormat &rhs);
+
+    bool
+    operator == (lldb::SBTypeFormat &rhs);
+    
+    bool
+    operator != (lldb::SBTypeFormat &rhs);
+    
+protected:
+    friend class SBDebugger;
+    friend class SBTypeCategory;
+    friend class SBValue;
+    
+    lldb::TypeFormatImplSP
+    GetSP ();
+    
+    void
+    SetSP (const lldb::TypeFormatImplSP &typeformat_impl_sp);    
+    
+    lldb::TypeFormatImplSP m_opaque_sp;
+    
+    SBTypeFormat (const lldb::TypeFormatImplSP &);
+    
+    enum class Type
+    {
+        eTypeKeepSame,
+        eTypeFormat,
+        eTypeEnum
+    };
+    
+    bool
+    CopyOnWrite_Impl(Type);
+    
+};
+
+    
+} // namespace lldb
+
+#endif // LLDB_SBTypeFormat_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h b/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
new file mode 100644
index 000000000000..71700a7123d5
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
@@ -0,0 +1,77 @@
+//===-- SBTypeNameSpecifier.h --------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeNameSpecifier_h_
+#define LLDB_SBTypeNameSpecifier_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+    
+    class LLDB_API SBTypeNameSpecifier
+    {
+    public:
+        
+        SBTypeNameSpecifier();
+        
+        SBTypeNameSpecifier (const char* name,
+                             bool is_regex = false);
+
+        SBTypeNameSpecifier (SBType type);
+        
+        SBTypeNameSpecifier (const lldb::SBTypeNameSpecifier &rhs);
+        
+        ~SBTypeNameSpecifier ();
+        
+        bool
+        IsValid() const;
+        
+        const char*
+        GetName();
+        
+        SBType
+        GetType ();
+        
+        bool
+        IsRegex();
+        
+        bool
+        GetDescription (lldb::SBStream &description, 
+                        lldb::DescriptionLevel description_level);
+        
+        lldb::SBTypeNameSpecifier &
+        operator = (const lldb::SBTypeNameSpecifier &rhs);
+        
+        bool
+        IsEqualTo (lldb::SBTypeNameSpecifier &rhs);
+
+        bool
+        operator == (lldb::SBTypeNameSpecifier &rhs);
+        
+        bool
+        operator != (lldb::SBTypeNameSpecifier &rhs);
+        
+    protected:
+        friend class SBDebugger;
+        friend class SBTypeCategory;
+        
+        lldb::TypeNameSpecifierImplSP
+        GetSP ();
+        
+        void
+        SetSP (const lldb::TypeNameSpecifierImplSP &type_namespec_sp);    
+        
+        lldb::TypeNameSpecifierImplSP m_opaque_sp;
+        
+        SBTypeNameSpecifier (const lldb::TypeNameSpecifierImplSP &);
+    };
+    
+} // namespace lldb
+
+#endif // LLDB_SBTypeNameSpecifier_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h b/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
new file mode 100644
index 000000000000..9b367ba5f982
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
@@ -0,0 +1,165 @@
+//===-- SBTypeSummary.h -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeSummary_h_
+#define LLDB_SBTypeSummary_h_
+
+#include "lldb/API/SBDefines.h"
+
+#ifndef LLDB_DISABLE_PYTHON
+
+namespace lldb {
+    class LLDB_API SBTypeSummaryOptions
+    {
+    public:
+        SBTypeSummaryOptions();
+
+        SBTypeSummaryOptions (const lldb::SBTypeSummaryOptions &rhs);
+        
+        SBTypeSummaryOptions (const lldb_private::TypeSummaryOptions *lldb_object_ptr);
+        
+        ~SBTypeSummaryOptions ();
+        
+        bool
+        IsValid ();
+        
+        lldb::LanguageType
+        GetLanguage ();
+        
+        lldb::TypeSummaryCapping
+        GetCapping ();
+        
+        void
+        SetLanguage (lldb::LanguageType);
+        
+        void
+        SetCapping (lldb::TypeSummaryCapping);
+        
+    protected:
+        friend class SBValue;
+        
+        lldb_private::TypeSummaryOptions *
+        operator->();
+        
+        const lldb_private::TypeSummaryOptions *
+        operator->() const;
+        
+        lldb_private::TypeSummaryOptions *
+        get ();
+        
+        lldb_private::TypeSummaryOptions &
+        ref();
+        
+        const lldb_private::TypeSummaryOptions &
+        ref() const;
+        
+        void
+        SetOptions (const lldb_private::TypeSummaryOptions *lldb_object_ptr);
+        
+    private:
+        std::unique_ptr<lldb_private::TypeSummaryOptions> m_opaque_ap;
+    };
+    
+    class SBTypeSummary
+    {
+    public:
+        
+        SBTypeSummary();
+        
+        static SBTypeSummary
+        CreateWithSummaryString (const char* data,
+                                 uint32_t options = 0); // see lldb::eTypeOption values
+        
+        static SBTypeSummary
+        CreateWithFunctionName (const char* data,
+                                uint32_t options = 0); // see lldb::eTypeOption values
+        
+        static SBTypeSummary
+        CreateWithScriptCode (const char* data,
+                              uint32_t options = 0); // see lldb::eTypeOption values
+        
+        SBTypeSummary (const lldb::SBTypeSummary &rhs);
+        
+        ~SBTypeSummary ();
+        
+        bool
+        IsValid() const;
+        
+        bool
+        IsFunctionCode();
+        
+        bool
+        IsFunctionName();
+        
+        bool
+        IsSummaryString();
+        
+        const char*
+        GetData ();
+        
+        void
+        SetSummaryString (const char* data);
+        
+        void
+        SetFunctionName (const char* data);
+        
+        void
+        SetFunctionCode (const char* data);
+        
+        uint32_t
+        GetOptions ();
+        
+        void
+        SetOptions (uint32_t);
+        
+        bool
+        GetDescription (lldb::SBStream &description, 
+                        lldb::DescriptionLevel description_level);
+        
+        lldb::SBTypeSummary &
+        operator = (const lldb::SBTypeSummary &rhs);
+        
+        bool
+        IsEqualTo (lldb::SBTypeSummary &rhs);
+
+        bool
+        operator == (lldb::SBTypeSummary &rhs);
+        
+        bool
+        operator != (lldb::SBTypeSummary &rhs);
+        
+    protected:
+        friend class SBDebugger;
+        friend class SBTypeCategory;
+        friend class SBValue;
+        
+        lldb::TypeSummaryImplSP
+        GetSP ();
+        
+        void
+        SetSP (const lldb::TypeSummaryImplSP &typefilter_impl_sp);    
+        
+        lldb::TypeSummaryImplSP m_opaque_sp;
+        
+        SBTypeSummary (const lldb::TypeSummaryImplSP &);
+        
+        bool
+        CopyOnWrite_Impl();
+        
+        bool
+        ChangeSummaryType (bool want_script);
+        
+    };
+    
+    
+} // namespace lldb
+
+#endif // LLDB_DISABLE_PYTHON
+
+#endif // LLDB_SBTypeSummary_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h b/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
new file mode 100644
index 000000000000..5dd11757ba40
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
@@ -0,0 +1,102 @@
+//===-- SBTypeSynthetic.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBTypeSynthetic_h_
+#define LLDB_SBTypeSynthetic_h_
+
+#include "lldb/API/SBDefines.h"
+
+#ifndef LLDB_DISABLE_PYTHON
+
+namespace lldb {
+    
+    class LLDB_API SBTypeSynthetic
+    {
+    public:
+        
+        SBTypeSynthetic();
+        
+        static SBTypeSynthetic
+        CreateWithClassName (const char* data,
+                             uint32_t options = 0); // see lldb::eTypeOption values
+        
+        static SBTypeSynthetic
+        CreateWithScriptCode (const char* data,
+                              uint32_t options = 0); // see lldb::eTypeOption values
+        
+        SBTypeSynthetic (const lldb::SBTypeSynthetic &rhs);
+        
+        ~SBTypeSynthetic ();
+        
+        bool
+        IsValid() const;
+        
+        bool
+        IsClassCode();
+
+        bool
+        IsClassName();
+        
+        const char*
+        GetData ();
+        
+        void
+        SetClassName (const char* data);
+        
+        void
+        SetClassCode (const char* data);
+                
+        uint32_t
+        GetOptions ();
+        
+        void
+        SetOptions (uint32_t);
+        
+        bool
+        GetDescription (lldb::SBStream &description, 
+                        lldb::DescriptionLevel description_level);
+        
+        lldb::SBTypeSynthetic &
+        operator = (const lldb::SBTypeSynthetic &rhs);
+
+        bool
+        IsEqualTo (lldb::SBTypeSynthetic &rhs);
+        
+        bool
+        operator == (lldb::SBTypeSynthetic &rhs);
+        
+        bool
+        operator != (lldb::SBTypeSynthetic &rhs);
+        
+    protected:
+        friend class SBDebugger;
+        friend class SBTypeCategory;
+        friend class SBValue;
+        
+        lldb::ScriptedSyntheticChildrenSP
+        GetSP ();
+        
+        void
+        SetSP (const lldb::ScriptedSyntheticChildrenSP &typefilter_impl_sp);    
+        
+        lldb::ScriptedSyntheticChildrenSP m_opaque_sp;
+        
+        SBTypeSynthetic (const lldb::ScriptedSyntheticChildrenSP &);
+        
+        bool
+        CopyOnWrite_Impl();
+        
+    };
+    
+    
+} // namespace lldb
+
+#endif // LLDB_DISABLE_PYTHON
+
+#endif // LLDB_SBTypeSynthetic_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h b/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
new file mode 100644
index 000000000000..9eae30739bb8
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
@@ -0,0 +1,84 @@
+//===-- SBUnixSignals.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBUnixSignals_h_
+#define LLDB_SBUnixSignals_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBUnixSignals {
+public:
+    SBUnixSignals ();
+
+    SBUnixSignals (const lldb::SBUnixSignals &rhs);
+
+    ~SBUnixSignals();
+
+    const SBUnixSignals &
+    operator =(const lldb::SBUnixSignals &rhs);
+
+    void
+    Clear ();
+
+    bool
+    IsValid () const;
+
+    const char *
+    GetSignalAsCString (int32_t signo) const;
+
+    int32_t
+    GetSignalNumberFromName (const char *name) const;
+
+    bool
+    GetShouldSuppress (int32_t signo) const;
+
+    bool
+    SetShouldSuppress (int32_t signo,
+                       bool value);
+
+    bool
+    GetShouldStop (int32_t signo) const;
+
+    bool
+    SetShouldStop (int32_t signo,
+                   bool value);
+
+    bool
+    GetShouldNotify (int32_t signo) const;
+
+    bool
+    SetShouldNotify (int32_t signo, bool value);
+
+    int32_t
+    GetNumSignals () const;
+
+    int32_t
+    GetSignalAtIndex (int32_t index) const;
+
+protected:
+    friend class SBProcess;
+
+    SBUnixSignals (lldb::ProcessSP &process_sp);
+
+    lldb::ProcessSP
+    GetSP() const;
+
+    void
+    SetSP (const lldb::ProcessSP &process_sp);
+
+private:
+    lldb::ProcessWP m_opaque_wp;
+};
+
+
+} // namespace lldb
+
+#endif // LLDB_SBUnixSignals_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBValue.h b/kcov-38/external/lldb/include/lldb/API/SBValue.h
new file mode 100644
index 000000000000..a070b149f34f
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBValue.h
@@ -0,0 +1,504 @@
+//===-- SBValue.h -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBValue_h_
+#define LLDB_SBValue_h_
+
+#include "lldb/API/SBData.h"
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBType.h"
+
+class ValueImpl;
+class ValueLocker;
+
+namespace lldb {
+
+class LLDB_API SBValue
+{
+public:
+    SBValue ();
+
+    SBValue (const lldb::SBValue &rhs);
+
+    lldb::SBValue &
+    operator =(const lldb::SBValue &rhs);
+    
+    ~SBValue ();
+
+    bool
+    IsValid();
+    
+    void
+    Clear();
+    
+    SBError
+    GetError();
+
+    lldb::user_id_t
+    GetID ();
+    
+    const char *
+    GetName();
+
+    const char *
+    GetTypeName ();
+    
+    const char *
+    GetDisplayTypeName ();
+
+    size_t
+    GetByteSize ();
+
+    bool
+    IsInScope ();
+
+    lldb::Format
+    GetFormat ();
+    
+    void
+    SetFormat (lldb::Format format);
+
+    const char *
+    GetValue ();
+
+    int64_t
+    GetValueAsSigned (lldb::SBError& error, int64_t fail_value=0);
+    
+    uint64_t
+    GetValueAsUnsigned (lldb::SBError& error, uint64_t fail_value=0);
+    
+    int64_t
+    GetValueAsSigned(int64_t fail_value=0);
+    
+    uint64_t
+    GetValueAsUnsigned(uint64_t fail_value=0);
+
+    ValueType
+    GetValueType ();
+
+    // If you call this on a newly created ValueObject, it will always return false.
+    bool
+    GetValueDidChange ();
+
+    const char *
+    GetSummary ();
+    
+    const char *
+    GetSummary (lldb::SBStream& stream,
+                lldb::SBTypeSummaryOptions& options);
+    
+    const char *
+    GetObjectDescription ();
+    
+    const char *
+    GetTypeValidatorResult ();
+    
+    lldb::SBValue
+    GetDynamicValue (lldb::DynamicValueType use_dynamic);
+    
+    lldb::SBValue
+    GetStaticValue ();
+    
+    lldb::SBValue
+    GetNonSyntheticValue ();
+    
+    lldb::DynamicValueType
+    GetPreferDynamicValue ();
+    
+    void
+    SetPreferDynamicValue (lldb::DynamicValueType use_dynamic);
+    
+    bool
+    GetPreferSyntheticValue ();
+    
+    void
+    SetPreferSyntheticValue (bool use_synthetic);
+    
+    bool
+    IsDynamic ();
+    
+    bool
+    IsSynthetic ();
+
+    const char *
+    GetLocation ();
+
+    // Deprecated - use the one that takes SBError&
+    bool
+    SetValueFromCString (const char *value_str);
+
+    bool
+    SetValueFromCString (const char *value_str, lldb::SBError& error);
+    
+    lldb::SBTypeFormat
+    GetTypeFormat ();
+    
+#ifndef LLDB_DISABLE_PYTHON
+    lldb::SBTypeSummary
+    GetTypeSummary ();
+#endif
+
+    lldb::SBTypeFilter
+    GetTypeFilter ();
+    
+#ifndef LLDB_DISABLE_PYTHON
+    lldb::SBTypeSynthetic
+    GetTypeSynthetic ();
+#endif
+
+    lldb::SBValue
+    GetChildAtIndex (uint32_t idx);
+    
+    lldb::SBValue
+    CreateChildAtOffset (const char *name, uint32_t offset, lldb::SBType type);
+    
+    // Deprecated - use the expression evaluator to perform type casting
+    lldb::SBValue
+    Cast (lldb::SBType type);
+    
+    lldb::SBValue
+    CreateValueFromExpression (const char *name, const char* expression);
+    
+    lldb::SBValue
+    CreateValueFromExpression (const char *name, const char* expression, SBExpressionOptions &options);
+    
+    lldb::SBValue
+    CreateValueFromAddress (const char* name, 
+                            lldb::addr_t address, 
+                            lldb::SBType type);
+    
+    // this has no address! GetAddress() and GetLoadAddress() as well as AddressOf()
+    // on the return of this call all return invalid
+    lldb::SBValue
+    CreateValueFromData (const char* name,
+                         lldb::SBData data,
+                         lldb::SBType type);
+
+    //------------------------------------------------------------------
+    /// Get a child value by index from a value.
+    ///
+    /// Structs, unions, classes, arrays and pointers have child
+    /// values that can be access by index. 
+    ///
+    /// Structs and unions access child members using a zero based index
+    /// for each child member. For
+    /// 
+    /// Classes reserve the first indexes for base classes that have 
+    /// members (empty base classes are omitted), and all members of the
+    /// current class will then follow the base classes. 
+    ///
+    /// Pointers differ depending on what they point to. If the pointer
+    /// points to a simple type, the child at index zero
+    /// is the only child value available, unless \a synthetic_allowed 
+    /// is \b true, in which case the pointer will be used as an array
+    /// and can create 'synthetic' child values using positive or 
+    /// negative indexes. If the pointer points to an aggregate type 
+    /// (an array, class, union, struct), then the pointee is 
+    /// transparently skipped and any children are going to be the indexes
+    /// of the child values within the aggregate type. For example if
+    /// we have a 'Point' type and we have a SBValue that contains a
+    /// pointer to a 'Point' type, then the child at index zero will be
+    /// the 'x' member, and the child at index 1 will be the 'y' member
+    /// (the child at index zero won't be a 'Point' instance).
+    /// 
+    /// Arrays have a preset number of children that can be accessed by
+    /// index and will returns invalid child values for indexes that are
+    /// out of bounds unless the \a synthetic_allowed is \b true. In this
+    /// case the array can create 'synthetic' child values for indexes 
+    /// that aren't in the array bounds using positive or negative 
+    /// indexes.
+    ///
+    /// @param[in] idx
+    ///     The index of the child value to get
+    ///
+    /// @param[in] use_dynamic
+    ///     An enumeration that specifies whether to get dynamic values,
+    ///     and also if the target can be run to figure out the dynamic
+    ///     type of the child value.
+    ///
+    /// @param[in] can_create_synthetic
+    ///     If \b true, then allow child values to be created by index
+    ///     for pointers and arrays for indexes that normally wouldn't
+    ///     be allowed.
+    ///
+    /// @return
+    ///     A new SBValue object that represents the child member value.
+    //------------------------------------------------------------------
+    lldb::SBValue
+    GetChildAtIndex (uint32_t idx, 
+                     lldb::DynamicValueType use_dynamic,
+                     bool can_create_synthetic);
+
+    // Matches children of this object only and will match base classes and
+    // member names if this is a clang typed object.
+    uint32_t
+    GetIndexOfChildWithName (const char *name);
+
+    // Matches child members of this object and child members of any base
+    // classes.
+    lldb::SBValue
+    GetChildMemberWithName (const char *name);
+
+    // Matches child members of this object and child members of any base
+    // classes.
+    lldb::SBValue
+    GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dynamic);
+    
+    // Expands nested expressions like .a->b[0].c[1]->d
+    lldb::SBValue
+    GetValueForExpressionPath(const char* expr_path);
+    
+    lldb::SBValue
+    AddressOf();
+    
+    lldb::addr_t
+    GetLoadAddress();
+    
+    lldb::SBAddress
+    GetAddress();
+
+    //------------------------------------------------------------------
+    /// Get an SBData wrapping what this SBValue points to.
+    ///
+    /// This method will dereference the current SBValue, if its
+    /// data type is a T* or T[], and extract item_count elements
+    /// of type T from it, copying their contents in an SBData. 
+    ///
+    /// @param[in] item_idx
+    ///     The index of the first item to retrieve. For an array
+    ///     this is equivalent to array[item_idx], for a pointer
+    ///     to *(pointer + item_idx). In either case, the measurement
+    ///     unit for item_idx is the sizeof(T) rather than the byte
+    ///
+    /// @param[in] item_count
+    ///     How many items should be copied into the output. By default
+    ///     only one item is copied, but more can be asked for.
+    ///
+    /// @return
+    ///     An SBData with the contents of the copied items, on success.
+    ///     An empty SBData otherwise.
+    //------------------------------------------------------------------
+    lldb::SBData
+    GetPointeeData (uint32_t item_idx = 0,
+                    uint32_t item_count = 1);
+    
+    //------------------------------------------------------------------
+    /// Get an SBData wrapping the contents of this SBValue.
+    ///
+    /// This method will read the contents of this object in memory
+    /// and copy them into an SBData for future use. 
+    ///
+    /// @return
+    ///     An SBData with the contents of this SBValue, on success.
+    ///     An empty SBData otherwise.
+    //------------------------------------------------------------------
+    lldb::SBData
+    GetData ();
+    
+    bool
+    SetData (lldb::SBData &data, lldb::SBError& error);
+    
+    lldb::SBDeclaration
+    GetDeclaration ();
+    
+    //------------------------------------------------------------------
+    /// Find out if a SBValue might have children.
+    ///
+    /// This call is much more efficient than GetNumChildren() as it
+    /// doesn't need to complete the underlying type. This is designed
+    /// to be used in a UI environment in order to detect if the
+    /// disclosure triangle should be displayed or not.
+    ///
+    /// This function returns true for class, union, structure,
+    /// pointers, references, arrays and more. Again, it does so without
+    /// doing any expensive type completion.
+    ///
+    /// @return
+    ///     Returns \b true if the SBValue might have children, or \b
+    ///     false otherwise.
+    //------------------------------------------------------------------
+    bool
+    MightHaveChildren ();
+    
+    bool
+    IsRuntimeSupportValue ();
+
+    uint32_t
+    GetNumChildren ();
+
+    void *
+    GetOpaqueType();
+
+    lldb::SBTarget
+    GetTarget();
+    
+    lldb::SBProcess
+    GetProcess();
+    
+    lldb::SBThread
+    GetThread();
+
+    lldb::SBFrame
+    GetFrame();
+    
+    lldb::SBValue
+    Dereference ();
+
+    bool
+    TypeIsPointerType ();
+    
+    lldb::SBType
+    GetType();
+    
+    lldb::SBValue
+    Persist ();
+
+    bool
+    GetDescription (lldb::SBStream &description);
+
+    bool
+    GetExpressionPath (lldb::SBStream &description);
+    
+    bool
+    GetExpressionPath (lldb::SBStream &description, 
+                       bool qualify_cxx_base_classes);
+
+    SBValue (const lldb::ValueObjectSP &value_sp);
+
+    //------------------------------------------------------------------
+    /// Watch this value if it resides in memory.
+    ///
+    /// Sets a watchpoint on the value.
+    ///
+    /// @param[in] resolve_location
+    ///     Resolve the location of this value once and watch its address.
+    ///     This value must currently be set to \b true as watching all
+    ///     locations of a variable or a variable path is not yet supported,
+    ///     though we plan to support it in the future.
+    ///
+    /// @param[in] read
+    ///     Stop when this value is accessed.
+    ///
+    /// @param[in] write
+    ///     Stop when this value is modified
+    ///
+    /// @param[out] error
+    ///     An error object. Contains the reason if there is some failure.
+    ///
+    /// @return
+    ///     An SBWatchpoint object. This object might not be valid upon
+    ///     return due to a value not being contained in memory, too 
+    ///     large, or watchpoint resources are not available or all in
+    ///     use.
+    //------------------------------------------------------------------
+    lldb::SBWatchpoint
+    Watch (bool resolve_location, bool read, bool write, SBError &error);
+
+    // Backward compatibility fix in the interim.
+    lldb::SBWatchpoint
+    Watch (bool resolve_location, bool read, bool write);
+
+    //------------------------------------------------------------------
+    /// Watch this value that this value points to in memory
+    ///
+    /// Sets a watchpoint on the value.
+    ///
+    /// @param[in] resolve_location
+    ///     Resolve the location of this value once and watch its address.
+    ///     This value must currently be set to \b true as watching all
+    ///     locations of a variable or a variable path is not yet supported,
+    ///     though we plan to support it in the future.
+    ///
+    /// @param[in] read
+    ///     Stop when this value is accessed.
+    ///
+    /// @param[in] write
+    ///     Stop when this value is modified
+    ///
+    /// @param[out] error
+    ///     An error object. Contains the reason if there is some failure.
+    ///
+    /// @return
+    ///     An SBWatchpoint object. This object might not be valid upon
+    ///     return due to a value not being contained in memory, too 
+    ///     large, or watchpoint resources are not available or all in
+    ///     use.
+    //------------------------------------------------------------------
+    lldb::SBWatchpoint
+    WatchPointee (bool resolve_location, bool read, bool write, SBError &error);
+
+    //------------------------------------------------------------------
+    /// Same as the protected version of GetSP that takes a locker, except that we make the
+    /// locker locally in the function.  Since the Target API mutex is recursive, and the
+    /// StopLocker is a read lock, you can call this function even if you are already
+    /// holding the two above-mentioned locks.
+    ///
+    /// @return
+    ///     A ValueObjectSP of the best kind (static, dynamic or synthetic) we
+    ///     can cons up, in accordance with the SBValue's settings.
+    //------------------------------------------------------------------
+    lldb::ValueObjectSP
+    GetSP () const;
+
+protected:
+    friend class SBBlock;
+    friend class SBFrame;
+    friend class SBTarget;
+    friend class SBThread;
+    friend class SBValueList;
+
+    //------------------------------------------------------------------
+    /// Get the appropriate ValueObjectSP from this SBValue, consulting the
+    /// use_dynamic and use_synthetic options passed in to SetSP when the
+    /// SBValue's contents were set.  Since this often requires examining memory,
+    /// and maybe even running code, it needs to acquire the Target API and Process StopLock.
+    /// Those are held in an opaque class ValueLocker which is currently local to SBValue.cpp.
+    /// So you don't have to get these yourself just default construct a ValueLocker, and pass it into this.
+    /// If we need to make a ValueLocker and use it in some other .cpp file, we'll have to move it to
+    /// ValueObject.h/cpp or somewhere else convenient.  We haven't needed to so far.
+    ///
+    /// @param[in] value_locker
+    ///     An object that will hold the Target API, and Process RunLocks, and
+    ///     auto-destroy them when it goes out of scope.  Currently this is only useful in
+    ///     SBValue.cpp.
+    ///
+    /// @return
+    ///     A ValueObjectSP of the best kind (static, dynamic or synthetic) we
+    ///     can cons up, in accordance with the SBValue's settings.
+    //------------------------------------------------------------------
+    lldb::ValueObjectSP
+    GetSP (ValueLocker &value_locker) const;
+    
+    // these calls do the right thing WRT adjusting their settings according to the target's preferences
+    void
+    SetSP (const lldb::ValueObjectSP &sp);
+
+    void
+    SetSP (const lldb::ValueObjectSP &sp, bool use_synthetic);
+    
+    void
+    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic);
+
+    void
+    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic, bool use_synthetic);
+    
+    void
+    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic, bool use_synthetic, const char *name);
+    
+private:
+    typedef std::shared_ptr<ValueImpl> ValueImplSP;
+    ValueImplSP m_opaque_sp;
+    
+    void
+    SetSP (ValueImplSP impl_sp);
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBValue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBValueList.h b/kcov-38/external/lldb/include/lldb/API/SBValueList.h
new file mode 100644
index 000000000000..563ca3d7e1bf
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBValueList.h
@@ -0,0 +1,96 @@
+//===-- SBValueList.h -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBValueList_h_
+#define LLDB_SBValueList_h_
+
+#include "lldb/API/SBDefines.h"
+
+class ValueListImpl;
+
+namespace lldb {
+
+class LLDB_API SBValueList
+{
+public:
+
+    SBValueList ();
+
+    SBValueList (const lldb::SBValueList &rhs);
+
+    ~SBValueList();
+
+    bool
+    IsValid() const;
+    
+    void
+    Clear();
+
+    void
+    Append (const lldb::SBValue &val_obj);
+
+    void
+    Append (const lldb::SBValueList& value_list);
+
+    uint32_t
+    GetSize() const;
+
+    lldb::SBValue
+    GetValueAtIndex (uint32_t idx) const;
+    
+    lldb::SBValue
+    GetFirstValueByName (const char* name) const;
+
+    lldb::SBValue
+    FindValueObjectByUID (lldb::user_id_t uid);
+
+    const lldb::SBValueList &
+    operator = (const lldb::SBValueList &rhs);
+
+protected:
+    
+    // only useful for visualizing the pointer or comparing two SBValueLists
+    // to see if they are backed by the same underlying Impl.
+    void *
+    opaque_ptr ();
+
+private:
+    friend class SBFrame;
+    
+    SBValueList (const ValueListImpl *lldb_object_ptr);
+
+    void
+    Append (lldb::ValueObjectSP& val_obj_sp);
+
+    void
+    CreateIfNeeded ();
+
+    ValueListImpl *
+    operator -> ();
+    
+    ValueListImpl &
+    operator* ();
+    
+    const ValueListImpl *
+    operator -> () const;
+    
+    const ValueListImpl &
+    operator* () const;
+    
+    
+    ValueListImpl &
+    ref ();
+    
+    std::unique_ptr<ValueListImpl> m_opaque_ap;
+};
+
+
+} // namespace lldb
+
+#endif  // LLDB_SBValueList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h b/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
new file mode 100644
index 000000000000..527310f5dfc7
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
@@ -0,0 +1,98 @@
+//===-- SBVariablesOptions.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBVariablesOptions_h_
+#define LLDB_SBVariablesOptions_h_
+
+#include "lldb/API/SBDefines.h"
+
+class VariablesOptionsImpl;
+
+namespace lldb {
+
+class LLDB_API SBVariablesOptions
+{
+public:
+    SBVariablesOptions ();
+    
+    SBVariablesOptions (const SBVariablesOptions& options);
+    
+    SBVariablesOptions&
+    operator = (const SBVariablesOptions& options);
+    
+    ~SBVariablesOptions ();
+    
+    bool
+    IsValid () const;
+    
+    bool
+    GetIncludeArguments () const;
+    
+    void
+    SetIncludeArguments (bool);
+    
+    bool
+    GetIncludeLocals () const;
+    
+    void
+    SetIncludeLocals (bool);
+    
+    bool
+    GetIncludeStatics () const;
+    
+    void
+    SetIncludeStatics (bool);
+    
+    bool
+    GetInScopeOnly () const;
+    
+    void
+    SetInScopeOnly (bool);
+    
+    bool
+    GetIncludeRuntimeSupportValues () const;
+    
+    void
+    SetIncludeRuntimeSupportValues (bool);
+    
+    lldb::DynamicValueType
+    GetUseDynamic () const;
+    
+    void
+    SetUseDynamic (lldb::DynamicValueType);
+    
+protected:
+    VariablesOptionsImpl *
+    operator->();
+    
+    const VariablesOptionsImpl *
+    operator->() const;
+    
+    VariablesOptionsImpl *
+    get ();
+    
+    VariablesOptionsImpl &
+    ref();
+    
+    const VariablesOptionsImpl &
+    ref() const;
+    
+    SBVariablesOptions (VariablesOptionsImpl *lldb_object_ptr);
+    
+    void
+    SetOptions (VariablesOptionsImpl *lldb_object_ptr);
+    
+private:
+    
+    std::unique_ptr<VariablesOptionsImpl> m_opaque_ap;
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBValue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h b/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
new file mode 100644
index 000000000000..5d0d48ee12f2
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
@@ -0,0 +1,104 @@
+//===-- SBWatchpoint.h ----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBWatchpoint_h_
+#define LLDB_SBWatchpoint_h_
+
+#include "lldb/API/SBDefines.h"
+
+namespace lldb {
+
+class LLDB_API SBWatchpoint
+{
+public:
+
+    SBWatchpoint ();
+
+    SBWatchpoint (const lldb::SBWatchpoint &rhs);
+
+    SBWatchpoint (const lldb::WatchpointSP &wp_sp);
+
+    ~SBWatchpoint ();
+
+    const lldb::SBWatchpoint &
+    operator = (const lldb::SBWatchpoint &rhs);
+
+    bool
+    IsValid() const;
+
+    SBError
+    GetError();
+
+    watch_id_t
+    GetID ();
+
+    /// With -1 representing an invalid hardware index.
+    int32_t
+    GetHardwareIndex ();
+
+    lldb::addr_t
+    GetWatchAddress ();
+
+    size_t
+    GetWatchSize();
+
+    void
+    SetEnabled(bool enabled);
+
+    bool
+    IsEnabled ();
+
+    uint32_t
+    GetHitCount ();
+
+    uint32_t
+    GetIgnoreCount ();
+
+    void
+    SetIgnoreCount (uint32_t n);
+
+    const char *
+    GetCondition ();
+
+    void 
+    SetCondition (const char *condition);
+    
+    bool
+    GetDescription (lldb::SBStream &description, DescriptionLevel level);
+
+    void
+    Clear ();
+
+    lldb::WatchpointSP
+    GetSP () const;
+
+    void
+    SetSP (const lldb::WatchpointSP &sp);
+
+    static bool
+    EventIsWatchpointEvent (const lldb::SBEvent &event);
+    
+    static lldb::WatchpointEventType
+    GetWatchpointEventTypeFromEvent (const lldb::SBEvent& event);
+
+    static lldb::SBWatchpoint
+    GetWatchpointFromEvent (const lldb::SBEvent& event);
+
+private:
+    friend class SBTarget;
+    friend class SBValue;
+
+    
+    lldb::WatchpointSP m_opaque_sp;
+
+};
+
+} // namespace lldb
+
+#endif  // LLDB_SBWatchpoint_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h b/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
new file mode 100644
index 000000000000..6280fe8aef04
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
@@ -0,0 +1,40 @@
+//===-- SystemInitializerFull.h ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_API_SYSTEM_INITIALIZER_FULL_H
+#define LLDB_API_SYSTEM_INITIALIZER_FULL_H
+
+#include "lldb/Initialization/SystemInitializerCommon.h"
+
+namespace lldb_private
+{
+//------------------------------------------------------------------
+/// Initializes lldb.
+///
+/// This class is responsible for initializing all of lldb system
+/// services needed to use the full LLDB application.  This class is
+/// not intended to be used externally, but is instead used
+/// internally by SBDebugger to initialize the system.
+//------------------------------------------------------------------
+class SystemInitializerFull : public SystemInitializerCommon
+{
+  public:
+    SystemInitializerFull();
+    virtual ~SystemInitializerFull();
+
+    void Initialize() override;
+    void Terminate() override;
+
+  private:
+    void InitializeSWIG();
+    void TerminateSWIG();
+};
+}
+
+#endif
diff --git a/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h b/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
new file mode 100644
index 000000000000..5c77dad9f7ff
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
@@ -0,0 +1,841 @@
+//===---------------------SharingPtr.h --------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef utility_SharingPtr_h_
+#define utility_SharingPtr_h_
+
+#include <algorithm>
+#include <memory>
+
+// Microsoft Visual C++ currently does not enable std::atomic to work
+// in CLR mode - as such we need to "hack around it" for MSVC++ builds only
+// using Windows specific intrinsics instead of the C++11 atomic support
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <atomic>
+#endif
+
+//#define ENABLE_SP_LOGGING 1 // DON'T CHECK THIS LINE IN UNLESS COMMENTED OUT
+#if defined (ENABLE_SP_LOGGING)
+
+extern "C" void track_sp (void *sp_this, void *ptr, long count);
+
+#endif
+
+namespace lldb_private {
+
+namespace imp {
+    
+class shared_count
+{
+    shared_count(const shared_count&);
+    shared_count& operator=(const shared_count&);
+
+protected:
+#ifdef _MSC_VER
+    long shared_owners_;
+#else
+    std::atomic<long> shared_owners_;
+#endif
+    virtual ~shared_count();
+private:
+    virtual void on_zero_shared() = 0;
+
+public:
+    explicit shared_count(long refs = 0)
+        : shared_owners_(refs) {}
+
+    void add_shared();
+    void release_shared();
+    long use_count() const {return shared_owners_ + 1;}
+};
+
+template <class T>
+class shared_ptr_pointer
+    : public shared_count
+{
+    T data_;
+public:
+    shared_ptr_pointer(T p)
+        :  data_(p) {}
+
+private:
+    virtual void on_zero_shared();
+
+    // Outlaw copy constructor and assignment operator to keep effective C++
+    // warnings down to a minimum
+    shared_ptr_pointer (const shared_ptr_pointer &);
+    shared_ptr_pointer & operator=(const shared_ptr_pointer &);
+};
+
+template <class T>
+void
+shared_ptr_pointer<T>::on_zero_shared()
+{
+    delete data_;
+}
+
+template <class T>
+class shared_ptr_emplace
+    : public shared_count
+{
+    T data_;
+public:
+
+    shared_ptr_emplace()
+        :  data_() {}
+
+    template <class A0>
+        shared_ptr_emplace(A0& a0)
+            :  data_(a0) {}
+
+    template <class A0, class A1>
+        shared_ptr_emplace(A0& a0, A1& a1)
+            :  data_(a0, a1) {}
+
+    template <class A0, class A1, class A2>
+        shared_ptr_emplace(A0& a0, A1& a1, A2& a2)
+            :  data_(a0, a1, a2) {}
+
+    template <class A0, class A1, class A2, class A3>
+        shared_ptr_emplace(A0& a0, A1& a1, A2& a2, A3& a3)
+            :  data_(a0, a1, a2, a3) {}
+
+    template <class A0, class A1, class A2, class A3, class A4>
+        shared_ptr_emplace(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
+            :  data_(a0, a1, a2, a3, a4) {}
+
+private:
+    virtual void on_zero_shared();
+public:
+    T* get() {return &data_;}
+};
+
+template <class T>
+void
+shared_ptr_emplace<T>::on_zero_shared()
+{
+}
+
+}  // namespace
+
+template<class T>
+class SharingPtr
+{
+public: 
+    typedef T element_type; 
+private:
+    element_type*      ptr_;
+    imp::shared_count* cntrl_;
+
+    struct nat {int for_bool_;};
+public:
+    SharingPtr();
+    SharingPtr(std::nullptr_t);
+    template<class Y> explicit SharingPtr(Y* p);
+    template<class Y> explicit SharingPtr(Y* p, imp::shared_count *ctrl_block);
+    template<class Y> SharingPtr(const SharingPtr<Y>& r, element_type *p); 
+    SharingPtr(const SharingPtr& r);
+    template<class Y>
+        SharingPtr(const SharingPtr<Y>& r);
+
+    ~SharingPtr();
+
+    SharingPtr& operator=(const SharingPtr& r); 
+    template<class Y> SharingPtr& operator=(const SharingPtr<Y>& r); 
+
+    void swap(SharingPtr& r);
+    void reset();
+    template<class Y> void reset(Y* p);
+    void reset(std::nullptr_t);
+
+    element_type* get() const {return ptr_;}
+    element_type& operator*() const {return *ptr_;}
+    element_type* operator->() const {return ptr_;}
+    long use_count() const {return cntrl_ ? cntrl_->use_count() : 0;}
+    bool unique() const {return use_count() == 1;}
+    bool empty() const {return cntrl_ == 0;}
+    operator nat*() const {return (nat*)get();}
+
+    static SharingPtr<T> make_shared();
+
+    template<class A0>
+        static SharingPtr<T> make_shared(A0&);
+
+    template<class A0, class A1>
+        static SharingPtr<T> make_shared(A0&, A1&);
+
+    template<class A0, class A1, class A2>
+        static SharingPtr<T> make_shared(A0&, A1&, A2&);
+
+    template<class A0, class A1, class A2, class A3>
+        static SharingPtr<T> make_shared(A0&, A1&, A2&, A3&);
+
+    template<class A0, class A1, class A2, class A3, class A4>
+        static SharingPtr<T> make_shared(A0&, A1&, A2&, A3&, A4&);
+
+private:
+
+    template <class U> friend class SharingPtr;
+};
+
+template<class T>
+inline
+SharingPtr<T>::SharingPtr()
+    : ptr_(0),
+      cntrl_(0)
+{
+}
+    
+template<class T>
+inline
+SharingPtr<T>::SharingPtr(std::nullptr_t)
+: ptr_(0),
+cntrl_(0)
+{
+}
+
+template<class T>
+template<class Y>
+SharingPtr<T>::SharingPtr(Y* p)
+    : ptr_(p), cntrl_(0)
+{
+    std::unique_ptr<Y> hold(p);
+    typedef imp::shared_ptr_pointer<Y*> _CntrlBlk;
+    cntrl_ = new _CntrlBlk(p);
+    hold.release();
+}
+
+template<class T>
+template<class Y>
+SharingPtr<T>::SharingPtr(Y* p, imp::shared_count *cntrl_block)
+    : ptr_(p), cntrl_(cntrl_block)
+{
+}
+
+template<class T>
+template<class Y>
+inline
+SharingPtr<T>::SharingPtr(const SharingPtr<Y>& r, element_type *p)
+    : ptr_(p),
+      cntrl_(r.cntrl_)
+{
+    if (cntrl_)
+        cntrl_->add_shared();
+}
+
+template<class T>
+inline
+SharingPtr<T>::SharingPtr(const SharingPtr& r)
+    : ptr_(r.ptr_),
+      cntrl_(r.cntrl_)
+{
+    if (cntrl_)
+        cntrl_->add_shared();
+}
+
+template<class T>
+template<class Y>
+inline
+SharingPtr<T>::SharingPtr(const SharingPtr<Y>& r)
+    : ptr_(r.ptr_),
+      cntrl_(r.cntrl_)
+{
+    if (cntrl_)
+        cntrl_->add_shared();
+}
+
+template<class T>
+SharingPtr<T>::~SharingPtr()
+{
+    if (cntrl_)
+        cntrl_->release_shared();
+}
+
+template<class T>
+inline
+SharingPtr<T>&
+SharingPtr<T>::operator=(const SharingPtr& r)
+{
+    SharingPtr(r).swap(*this);
+    return *this;
+}
+
+template<class T>
+template<class Y>
+inline
+SharingPtr<T>&
+SharingPtr<T>::operator=(const SharingPtr<Y>& r)
+{
+    SharingPtr(r).swap(*this);
+    return *this;
+}
+
+template<class T>
+inline
+void
+SharingPtr<T>::swap(SharingPtr& r)
+{
+    std::swap(ptr_, r.ptr_);
+    std::swap(cntrl_, r.cntrl_);
+}
+
+template<class T>
+inline
+void
+SharingPtr<T>::reset()
+{
+    SharingPtr().swap(*this);
+}
+
+template<class T>
+inline
+void
+SharingPtr<T>::reset (std::nullptr_t p)
+{
+    reset();
+}
+    
+template<class T>
+template<class Y>
+inline
+void
+SharingPtr<T>::reset(Y* p)
+{
+    SharingPtr(p).swap(*this);
+}
+
+template<class T>
+SharingPtr<T>
+SharingPtr<T>::make_shared()
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk();
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+template<class A0>
+SharingPtr<T>
+SharingPtr<T>::make_shared(A0& a0)
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk(a0);
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+template<class A0, class A1>
+SharingPtr<T>
+SharingPtr<T>::make_shared(A0& a0, A1& a1)
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk(a0, a1);
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+template<class A0, class A1, class A2>
+SharingPtr<T>
+SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2)
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk(a0, a1, a2);
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+template<class A0, class A1, class A2, class A3>
+SharingPtr<T>
+SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2, A3& a3)
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk(a0, a1, a2, a3);
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+template<class A0, class A1, class A2, class A3, class A4>
+SharingPtr<T>
+SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
+{
+    typedef imp::shared_ptr_emplace<T> CntrlBlk;
+    SharingPtr<T> r;
+    r.cntrl_ = new CntrlBlk(a0, a1, a2, a3, a4);
+    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
+    return r;
+}
+
+template<class T>
+inline
+SharingPtr<T>
+make_shared()
+{
+    return SharingPtr<T>::make_shared();
+}
+
+template<class T, class A0>
+inline
+SharingPtr<T>
+make_shared(A0& a0)
+{
+    return SharingPtr<T>::make_shared(a0);
+}
+
+template<class T, class A0, class A1>
+inline
+SharingPtr<T>
+make_shared(A0& a0, A1& a1)
+{
+    return SharingPtr<T>::make_shared(a0, a1);
+}
+
+template<class T, class A0, class A1, class A2>
+inline
+SharingPtr<T>
+make_shared(A0& a0, A1& a1, A2& a2)
+{
+    return SharingPtr<T>::make_shared(a0, a1, a2);
+}
+
+template<class T, class A0, class A1, class A2, class A3>
+inline
+SharingPtr<T>
+make_shared(A0& a0, A1& a1, A2& a2, A3& a3)
+{
+    return SharingPtr<T>::make_shared(a0, a1, a2, a3);
+}
+
+template<class T, class A0, class A1, class A2, class A3, class A4>
+inline
+SharingPtr<T>
+make_shared(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
+{
+    return SharingPtr<T>::make_shared(a0, a1, a2, a3, a4);
+}
+
+
+template<class T, class U>
+inline
+bool
+operator==(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
+{
+    return __x.get() == __y.get();
+}
+
+template<class T, class U>
+inline
+bool
+operator!=(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
+{
+    return !(__x == __y);
+}
+
+template<class T, class U>
+inline
+bool
+operator<(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
+{
+    return __x.get() < __y.get();
+}
+
+template<class T>
+inline
+void
+swap(SharingPtr<T>& __x, SharingPtr<T>& __y)
+{
+    __x.swap(__y);
+}
+
+template<class T, class U>
+inline
+SharingPtr<T>
+static_pointer_cast(const SharingPtr<U>& r)
+{
+    return SharingPtr<T>(r, static_cast<T*>(r.get()));
+}
+
+template<class T, class U>
+SharingPtr<T>
+const_pointer_cast(const SharingPtr<U>& r)
+{
+    return SharingPtr<T>(r, const_cast<T*>(r.get()));
+}
+
+template <class T>
+class LoggingSharingPtr
+    : public SharingPtr<T>
+{
+    typedef SharingPtr<T> base;
+
+public:
+    typedef void (*Callback)(void*, const LoggingSharingPtr&, bool action);
+    // action:  false means increment just happened
+    //          true  means decrement is about to happen
+
+private:
+    Callback cb_;
+    void* baton_;
+
+public:
+    LoggingSharingPtr() : cb_(0), baton_(0) {}
+    LoggingSharingPtr(Callback cb, void* baton)
+        : cb_(cb), baton_(baton)
+    {
+        if (cb_)
+            cb_(baton_, *this, false);
+    }
+
+    template <class Y>
+    LoggingSharingPtr(Y* p)
+        : base(p), cb_(0), baton_(0) {}
+
+    template <class Y>
+    LoggingSharingPtr(Y* p, Callback cb, void* baton)
+        : base(p), cb_(cb), baton_(baton)
+    {
+        if (cb_)
+            cb_(baton_, *this, false);
+    }
+
+    ~LoggingSharingPtr()
+    {
+        if (cb_)
+            cb_(baton_, *this, true);
+    }
+
+    LoggingSharingPtr(const LoggingSharingPtr& p)
+        : base(p), cb_(p.cb_), baton_(p.baton_)
+    {
+        if (cb_)
+            cb_(baton_, *this, false);
+    }
+
+    LoggingSharingPtr& operator=(const LoggingSharingPtr& p)
+    {
+        if (cb_)
+            cb_(baton_, *this, true);
+        base::operator=(p);
+        cb_ = p.cb_;
+        baton_ = p.baton_;
+        if (cb_)
+            cb_(baton_, *this, false);
+        return *this;
+    }
+
+    void reset()
+    {
+        if (cb_)
+            cb_(baton_, *this, true);
+        base::reset();
+    }
+
+    template <class Y>
+    void reset(Y* p)
+    {
+        if (cb_)
+            cb_(baton_, *this, true);
+        base::reset(p);
+        if (cb_)
+            cb_(baton_, *this, false);
+    }
+    
+    void SetCallback(Callback cb, void* baton)
+    {
+        cb_ = cb;
+        baton_ = baton;
+    }
+
+    void ClearCallback()
+    {
+        cb_ = 0;
+        baton_ = 0;
+    }
+};
+    
+    
+template <class T>
+class IntrusiveSharingPtr;
+
+template <class T>
+class ReferenceCountedBase
+{
+public:
+    explicit ReferenceCountedBase()
+        : shared_owners_(-1) 
+    {
+    }
+    
+    void
+    add_shared();
+
+    void
+    release_shared();
+
+    long 
+    use_count() const 
+    {
+        return shared_owners_ + 1;
+    }
+    
+protected:
+    long shared_owners_;
+   
+    friend class IntrusiveSharingPtr<T>;
+    
+private:
+    ReferenceCountedBase(const ReferenceCountedBase&);
+    ReferenceCountedBase& operator=(const ReferenceCountedBase&);
+};
+
+    template <class T>
+    void
+    lldb_private::ReferenceCountedBase<T>::add_shared()
+    {
+#ifdef _MSC_VER
+        _InterlockedIncrement(&shared_owners_);
+#else
+        ++shared_owners_;
+#endif
+    }
+    
+    template <class T>
+    void
+    lldb_private::ReferenceCountedBase<T>::release_shared()
+    {
+#ifdef _MSC_VER
+        if (_InterlockedDecrement(&shared_owners_) == -1)
+#else
+        if (--shared_owners_ == -1)
+#endif
+            delete static_cast<T*>(this);
+    }
+
+    
+template <class T>
+class ReferenceCountedBaseVirtual : public imp::shared_count
+{
+public:
+    explicit ReferenceCountedBaseVirtual () : 
+        imp::shared_count(-1)
+    {
+    }
+    
+    virtual
+    ~ReferenceCountedBaseVirtual ()
+    {
+    }
+    
+    virtual void on_zero_shared ();
+    
+};
+
+template <class T>
+void
+ReferenceCountedBaseVirtual<T>::on_zero_shared()
+{
+}
+
+template <typename T>
+class IntrusiveSharingPtr 
+{
+public:
+    typedef T element_type;
+    
+    explicit 
+    IntrusiveSharingPtr () : 
+        ptr_(0) 
+    {
+    }
+    
+    explicit
+    IntrusiveSharingPtr (T* ptr) : 
+        ptr_(ptr) 
+    {
+        add_shared();
+    }
+    
+    IntrusiveSharingPtr (const IntrusiveSharingPtr& rhs) : 
+        ptr_(rhs.ptr_) 
+    {
+        add_shared();
+    }
+    
+    template <class X>
+    IntrusiveSharingPtr (const IntrusiveSharingPtr<X>& rhs)
+        : ptr_(rhs.get()) 
+    {
+        add_shared();
+    }
+    
+    IntrusiveSharingPtr& 
+    operator= (const IntrusiveSharingPtr& rhs) 
+    {
+        reset(rhs.get());
+        return *this;
+    }
+    
+    template <class X> IntrusiveSharingPtr& 
+    operator= (const IntrusiveSharingPtr<X>& rhs) 
+    {
+        reset(rhs.get());
+        return *this;
+    }
+    
+    IntrusiveSharingPtr& 
+    operator= (T *ptr) 
+    {
+        reset(ptr);
+        return *this;
+    }
+    
+    ~IntrusiveSharingPtr() 
+    {
+        release_shared(); 
+#if defined (LLDB_CONFIGURATION_DEBUG) || defined (LLDB_CONFIGURATION_RELEASE)
+        // NULL out the pointer in objects which can help with leaks detection.
+        // We don't enable this for LLDB_CONFIGURATION_BUILD_AND_INTEGRATION or
+        // when none of the LLDB_CONFIGURATION_XXX macros are defined since
+        // those would be builds for release. But for debug and release builds
+        // that are for development, we NULL out the pointers to catch potential
+        // issues.
+        ptr_ = NULL; 
+#endif  // #if defined (LLDB_CONFIGURATION_DEBUG) || defined (LLDB_CONFIGURATION_RELEASE)
+    }
+    
+    T& 
+    operator*() const 
+    {
+        return *ptr_; 
+    }
+    
+    T* 
+    operator->() const
+    {
+        return ptr_; 
+    }
+    
+    T* 
+    get() const
+    {
+        return ptr_; 
+    }
+    
+    explicit operator bool() const
+    {
+        return ptr_ != 0;
+    }
+    
+    void 
+    swap (IntrusiveSharingPtr& rhs) 
+    {
+        std::swap(ptr_, rhs.ptr_);
+#if defined (ENABLE_SP_LOGGING)
+        track_sp (this, ptr_, use_count());
+        track_sp (&rhs, rhs.ptr_, rhs.use_count());
+#endif
+    }
+
+    void 
+    reset(T* ptr = NULL) 
+    {
+        IntrusiveSharingPtr(ptr).swap(*this);
+    }
+
+    long
+    use_count () const
+    {
+        if (ptr_)
+            return ptr_->use_count();
+        return 0;
+    }
+    
+    bool
+    unique () const
+    {
+        return use_count () == 1;
+    }
+
+private:
+    element_type *ptr_;
+    
+    void
+    add_shared() 
+    {
+        if (ptr_) 
+        {
+            ptr_->add_shared(); 
+#if defined (ENABLE_SP_LOGGING)
+            track_sp (this, ptr_, ptr_->use_count());
+#endif
+        }
+    }
+    void
+    release_shared()
+    { 
+        if (ptr_) 
+        {
+#if defined (ENABLE_SP_LOGGING)
+            track_sp (this, NULL, ptr_->use_count() - 1);
+#endif
+            ptr_->release_shared(); 
+        }
+    }
+};
+
+template<class T, class U>
+inline bool operator== (const IntrusiveSharingPtr<T>& lhs, const IntrusiveSharingPtr<U>& rhs)
+{
+    return lhs.get() == rhs.get();
+}
+
+template<class T, class U>
+inline bool operator!= (const IntrusiveSharingPtr<T>& lhs, const IntrusiveSharingPtr<U>& rhs)
+{
+    return lhs.get() != rhs.get();
+}
+
+template<class T, class U>
+inline bool operator== (const IntrusiveSharingPtr<T>& lhs, U* rhs)
+{
+    return lhs.get() == rhs;
+}
+
+template<class T, class U>
+inline bool operator!= (const IntrusiveSharingPtr<T>& lhs, U* rhs)
+{
+    return lhs.get() != rhs;
+}
+
+template<class T, class U>
+inline bool operator== (T* lhs, const IntrusiveSharingPtr<U>& rhs)
+{
+    return lhs == rhs.get();
+}
+
+template<class T, class U>
+inline bool operator!= (T* lhs, const IntrusiveSharingPtr<U>& rhs)
+{
+    return lhs != rhs.get();
+}
+
+} // namespace lldb_private
+
+#endif  // utility_SharingPtr_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-defines.h b/kcov-38/external/lldb/include/lldb/lldb-defines.h
new file mode 100644
index 000000000000..9dce69aef32b
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/lldb-defines.h
@@ -0,0 +1,153 @@
+//===-- lldb-defines.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_lldb_defines_h_
+#define LLDB_lldb_defines_h_
+
+#include "lldb/lldb-types.h"
+
+#if defined (_MSC_VER)
+    #if defined(EXPORT_LIBLLDB)
+        #define  LLDB_API __declspec(dllexport)
+    #elif defined(IMPORT_LIBLLDB)
+        #define  LLDB_API __declspec(dllimport)
+    #else
+        #define LLDB_API
+    #endif
+#else // defined (_MSC_VER)
+    #define LLDB_API
+#endif
+
+#if !defined(INT32_MAX)
+    #define INT32_MAX 2147483647
+#endif
+
+#if !defined(UINT32_MAX)
+    #define UINT32_MAX 4294967295U
+#endif
+
+#if !defined(UINT64_MAX)
+    #define UINT64_MAX 18446744073709551615ULL
+#endif
+
+//----------------------------------------------------------------------
+// LLDB version
+//
+// A build script phase can modify this version number if needed.
+//----------------------------------------------------------------------
+//#define LLDB_VERSION
+//#define LLDB_REVISION
+//#define LLDB_VERSION_STRING
+
+//----------------------------------------------------------------------
+// LLDB defines
+//----------------------------------------------------------------------
+#define LLDB_GENERIC_ERROR              UINT32_MAX
+
+//----------------------------------------------------------------------
+// Breakpoints
+//----------------------------------------------------------------------
+#define LLDB_INVALID_BREAK_ID           0
+#define LLDB_DEFAULT_BREAK_SIZE         0
+#define LLDB_BREAK_ID_IS_VALID(bid)     ((bid) != (LLDB_INVALID_BREAK_ID))
+#define LLDB_BREAK_ID_IS_INTERNAL(bid)  ((bid) < 0)
+
+//----------------------------------------------------------------------
+// Watchpoints
+//----------------------------------------------------------------------
+#define LLDB_INVALID_WATCH_ID           0
+#define LLDB_WATCH_ID_IS_VALID(uid)     ((uid) != (LLDB_INVALID_WATCH_ID))
+#define LLDB_WATCH_TYPE_READ            (1u << 0)
+#define LLDB_WATCH_TYPE_WRITE           (1u << 1)
+#define LLDB_WATCH_TYPE_IS_VALID(type)  ((type | LLDB_WATCH_TYPE_READ) || (type | LLDB_WATCH_TYPE_WRITE))
+
+//----------------------------------------------------------------------
+// Generic Register Numbers
+//----------------------------------------------------------------------
+#define LLDB_REGNUM_GENERIC_PC          0   // Program Counter
+#define LLDB_REGNUM_GENERIC_SP          1   // Stack Pointer
+#define LLDB_REGNUM_GENERIC_FP          2   // Frame Pointer
+#define LLDB_REGNUM_GENERIC_RA          3   // Return Address
+#define LLDB_REGNUM_GENERIC_FLAGS       4   // Processor flags register
+#define LLDB_REGNUM_GENERIC_ARG1        5   // The register that would contain pointer size or less argument 1 (if any)
+#define LLDB_REGNUM_GENERIC_ARG2        6   // The register that would contain pointer size or less argument 2 (if any)
+#define LLDB_REGNUM_GENERIC_ARG3        7   // The register that would contain pointer size or less argument 3 (if any)
+#define LLDB_REGNUM_GENERIC_ARG4        8   // The register that would contain pointer size or less argument 4 (if any)
+#define LLDB_REGNUM_GENERIC_ARG5        9   // The register that would contain pointer size or less argument 5 (if any)
+#define LLDB_REGNUM_GENERIC_ARG6        10  // The register that would contain pointer size or less argument 6 (if any)
+#define LLDB_REGNUM_GENERIC_ARG7        11  // The register that would contain pointer size or less argument 7 (if any)
+#define LLDB_REGNUM_GENERIC_ARG8        12  // The register that would contain pointer size or less argument 8 (if any)
+//---------------------------------------------------------------------
+/// Invalid value definitions
+//----------------------------------------------------------------------
+#define LLDB_INVALID_ADDRESS            UINT64_MAX
+#define LLDB_INVALID_INDEX32            UINT32_MAX
+#define LLDB_INVALID_IVAR_OFFSET        UINT32_MAX
+#define LLDB_INVALID_IMAGE_TOKEN        UINT32_MAX
+#define LLDB_INVALID_MODULE_VERSION     UINT32_MAX
+#define LLDB_INVALID_REGNUM             UINT32_MAX
+#define LLDB_INVALID_UID                UINT64_MAX
+#define LLDB_INVALID_PROCESS_ID         0
+#define LLDB_INVALID_THREAD_ID          0
+#define LLDB_INVALID_FRAME_ID           UINT32_MAX
+#define LLDB_INVALID_SIGNAL_NUMBER      INT32_MAX
+#define LLDB_INVALID_OFFSET             UINT64_MAX // Must match max of lldb::offset_t
+#define LLDB_INVALID_LINE_NUMBER        UINT32_MAX
+#define LLDB_INVALID_QUEUE_ID           0
+
+//----------------------------------------------------------------------
+/// CPU Type definitions
+//----------------------------------------------------------------------
+#define LLDB_ARCH_DEFAULT               "systemArch"
+#define LLDB_ARCH_DEFAULT_32BIT         "systemArch32"
+#define LLDB_ARCH_DEFAULT_64BIT         "systemArch64"
+#define LLDB_INVALID_CPUTYPE            (0xFFFFFFFEu)
+
+//----------------------------------------------------------------------
+/// Option Set definitions
+//----------------------------------------------------------------------
+// FIXME: I'm sure there's some #define magic that can create all 32 sets on the
+// fly.  That would have the added benefit of making this unreadable.
+#define LLDB_MAX_NUM_OPTION_SETS        32
+#define LLDB_OPT_SET_ALL                0xFFFFFFFFU
+#define LLDB_OPT_SET_1                  (1U << 0)
+#define LLDB_OPT_SET_2                  (1U << 1)
+#define LLDB_OPT_SET_3                  (1U << 2)
+#define LLDB_OPT_SET_4                  (1U << 3)
+#define LLDB_OPT_SET_5                  (1U << 4)
+#define LLDB_OPT_SET_6                  (1U << 5)
+#define LLDB_OPT_SET_7                  (1U << 6)
+#define LLDB_OPT_SET_8                  (1U << 7)
+#define LLDB_OPT_SET_9                  (1U << 8)
+#define LLDB_OPT_SET_10                 (1U << 9)
+#define LLDB_OPT_SET_FROM_TO(A, B)      (((1U << (B)) - 1) ^ (((1U << (A))-1) >> 1))
+
+#if defined (_WIN32) && !defined (MAX_PATH)
+#define MAX_PATH 260
+#endif
+
+#ifdef _MSC_VER
+// ignore GCC function attributes
+#define __attribute__(X)
+#endif
+
+#if defined(__cplusplus)
+
+//----------------------------------------------------------------------
+/// @def DISALLOW_COPY_AND_ASSIGN(TypeName)
+///     Macro definition for easily disallowing copy constructor and
+///     assignment operators in C++ classes.
+//----------------------------------------------------------------------
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+    TypeName(const TypeName&); \
+    const TypeName& operator=(const TypeName&)
+
+#endif // #if defined(__cplusplus)
+
+#endif  // LLDB_lldb_defines_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-enumerations.h b/kcov-38/external/lldb/include/lldb/lldb-enumerations.h
new file mode 100644
index 000000000000..ea8910525866
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/lldb-enumerations.h
@@ -0,0 +1,1052 @@
+//===-- lldb-enumerations.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_lldb_enumerations_h_
+#define LLDB_lldb_enumerations_h_
+
+#ifndef SWIG
+// With MSVC, the default type of an enum is always signed, even if one of the
+// enumerator values is too large to fit into a signed integer but would
+// otherwise fit into an unsigned integer.  As a result of this, all of LLDB's
+// flag-style enumerations that specify something like eValueFoo = 1u << 31
+// result in negative values.  This usually just results in a benign warning,
+// but in a few places we actually do comparisons on the enum values, which
+// would cause a real bug.  Furthermore, there's no way to silence only this
+// warning, as it's part of -Wmicrosoft which also catches a whole slew of
+// other useful issues.
+//
+// To make matters worse, early versions of SWIG don't recognize the syntax
+// of specifying the underlying type of an enum (and Python doesn't care anyway)
+// so we need a way to specify the underlying type when the enum is being used
+// from C++ code, but just use a regular enum when swig is pre-processing.
+#define FLAGS_ENUM(Name) enum Name : unsigned
+#define FLAGS_ANONYMOUS_ENUM() enum : unsigned
+#else
+#define FLAGS_ENUM(Name) enum Name
+#define FLAGS_ANONYMOUS_ENUM() enum
+#endif
+
+namespace lldb {
+
+    //----------------------------------------------------------------------
+    // Process and Thread States
+    //----------------------------------------------------------------------
+    enum StateType
+    {
+        eStateInvalid = 0,
+        eStateUnloaded,     ///< Process is object is valid, but not currently loaded
+        eStateConnected,    ///< Process is connected to remote debug services, but not launched or attached to anything yet
+        eStateAttaching,    ///< Process is currently trying to attach
+        eStateLaunching,    ///< Process is in the process of launching
+        eStateStopped,      ///< Process or thread is stopped and can be examined.
+        eStateRunning,      ///< Process or thread is running and can't be examined.
+        eStateStepping,     ///< Process or thread is in the process of stepping and can not be examined.
+        eStateCrashed,      ///< Process or thread has crashed and can be examined.
+        eStateDetached,     ///< Process has been detached and can't be examined.
+        eStateExited,       ///< Process has exited and can't be examined.
+        eStateSuspended     ///< Process or thread is in a suspended state as far
+                            ///< as the debugger is concerned while other processes
+                            ///< or threads get the chance to run.
+    };
+
+    //----------------------------------------------------------------------
+    // Launch Flags
+    //----------------------------------------------------------------------
+    FLAGS_ENUM(LaunchFlags)
+    {
+        eLaunchFlagNone         = 0u,
+        eLaunchFlagExec         = (1u << 0),       ///< Exec when launching and turn the calling process into a new process
+        eLaunchFlagDebug        = (1u << 1),       ///< Stop as soon as the process launches to allow the process to be debugged
+        eLaunchFlagStopAtEntry  = (1u << 2),       ///< Stop at the program entry point instead of auto-continuing when launching or attaching at entry point
+        eLaunchFlagDisableASLR  = (1u << 3),       ///< Disable Address Space Layout Randomization
+        eLaunchFlagDisableSTDIO = (1u << 4),       ///< Disable stdio for inferior process (e.g. for a GUI app)
+        eLaunchFlagLaunchInTTY  = (1u << 5),       ///< Launch the process in a new TTY if supported by the host
+        eLaunchFlagLaunchInShell= (1u << 6),       ///< Launch the process inside a shell to get shell expansion
+        eLaunchFlagLaunchInSeparateProcessGroup = (1u << 7), ///< Launch the process in a separate process group
+        eLaunchFlagDontSetExitStatus = (1u << 8), ///< If you are going to hand the process off (e.g. to debugserver)
+                                                   ///< set this flag so lldb & the handee don't race to set its exit status.
+        eLaunchFlagDetachOnError = (1u << 9),     ///< If set, then the client stub should detach rather than killing the debugee
+                                                   ///< if it loses connection with lldb.
+        eLaunchFlagShellExpandArguments  = (1u << 10),       ///< Perform shell-style argument expansion
+        eLaunchFlagCloseTTYOnExit = (1u << 11),    ///< Close the open TTY on exit
+    };
+        
+    //----------------------------------------------------------------------
+    // Thread Run Modes
+    //----------------------------------------------------------------------
+    enum RunMode
+    {
+        eOnlyThisThread,
+        eAllThreads,
+        eOnlyDuringStepping
+    };
+
+    //----------------------------------------------------------------------
+    // Byte ordering definitions
+    //----------------------------------------------------------------------
+    enum ByteOrder
+    {
+        eByteOrderInvalid   = 0,
+        eByteOrderBig       = 1,
+        eByteOrderPDP       = 2,
+        eByteOrderLittle    = 4
+    };
+
+    //----------------------------------------------------------------------
+    // Register encoding definitions
+    //----------------------------------------------------------------------
+    enum Encoding
+    {
+        eEncodingInvalid = 0,
+        eEncodingUint,               // unsigned integer
+        eEncodingSint,               // signed integer
+        eEncodingIEEE754,            // float
+        eEncodingVector              // vector registers
+    };
+
+    //----------------------------------------------------------------------
+    // Display format definitions
+    //----------------------------------------------------------------------
+    enum Format
+    {
+        eFormatDefault = 0,
+        eFormatInvalid = 0,
+        eFormatBoolean,
+        eFormatBinary,
+        eFormatBytes,
+        eFormatBytesWithASCII,
+        eFormatChar,
+        eFormatCharPrintable,   // Only printable characters, space if not printable
+        eFormatComplex,         // Floating point complex type
+        eFormatComplexFloat = eFormatComplex,
+        eFormatCString,         // NULL terminated C strings
+        eFormatDecimal,
+        eFormatEnum,
+        eFormatHex,
+        eFormatHexUppercase,
+        eFormatFloat,
+        eFormatOctal,
+        eFormatOSType,          // OS character codes encoded into an integer 'PICT' 'text' etc...
+        eFormatUnicode16,
+        eFormatUnicode32,
+        eFormatUnsigned,
+        eFormatPointer,
+        eFormatVectorOfChar,
+        eFormatVectorOfSInt8,
+        eFormatVectorOfUInt8,
+        eFormatVectorOfSInt16,
+        eFormatVectorOfUInt16,
+        eFormatVectorOfSInt32,
+        eFormatVectorOfUInt32,
+        eFormatVectorOfSInt64,
+        eFormatVectorOfUInt64,
+        eFormatVectorOfFloat32,
+        eFormatVectorOfFloat64,
+        eFormatVectorOfUInt128,
+        eFormatComplexInteger,      // Integer complex type
+        eFormatCharArray,           // Print characters with no single quotes, used for character arrays that can contain non printable characters
+        eFormatAddressInfo,         // Describe what an address points to (func + offset with file/line, symbol + offset, data, etc)
+        eFormatHexFloat,            // ISO C99 hex float string
+        eFormatInstruction,         // Disassemble an opcode
+        eFormatVoid,                // Do not print this
+        kNumFormats
+    };
+
+    //----------------------------------------------------------------------
+    // Description levels for "void GetDescription(Stream *, DescriptionLevel)" calls
+    //----------------------------------------------------------------------
+    enum DescriptionLevel
+    {
+        eDescriptionLevelBrief = 0,
+        eDescriptionLevelFull,
+        eDescriptionLevelVerbose,
+        eDescriptionLevelInitial,
+        kNumDescriptionLevels
+    };
+
+    //----------------------------------------------------------------------
+    // Script interpreter types
+    //----------------------------------------------------------------------
+    enum ScriptLanguage
+    {
+        eScriptLanguageNone,
+        eScriptLanguagePython,
+        eScriptLanguageDefault = eScriptLanguagePython
+    };
+
+    //----------------------------------------------------------------------
+    // Register numbering types
+    // See RegisterContext::ConvertRegisterKindToRegisterNumber to convert
+    // any of these to the lldb internal register numbering scheme 
+    // (eRegisterKindLLDB).
+    //----------------------------------------------------------------------
+    enum RegisterKind
+    {
+        eRegisterKindGCC = 0,    // the register numbers seen in eh_frame
+        eRegisterKindDWARF,      // the register numbers seen DWARF
+        eRegisterKindGeneric,    // insn ptr reg, stack ptr reg, etc not specific to any particular target
+        eRegisterKindGDB,        // the register numbers gdb uses (matches stabs numbers)
+        eRegisterKindLLDB,       // lldb's internal register numbers
+        kNumRegisterKinds
+    };
+
+    //----------------------------------------------------------------------
+    // Thread stop reasons
+    //----------------------------------------------------------------------
+    enum StopReason
+    {
+        eStopReasonInvalid = 0,
+        eStopReasonNone,
+        eStopReasonTrace,
+        eStopReasonBreakpoint,
+        eStopReasonWatchpoint,
+        eStopReasonSignal,
+        eStopReasonException,
+        eStopReasonExec,        // Program was re-exec'ed
+        eStopReasonPlanComplete,
+        eStopReasonThreadExiting,
+        eStopReasonInstrumentation
+    };
+
+    //----------------------------------------------------------------------
+    // Command Return Status Types
+    //----------------------------------------------------------------------
+    enum ReturnStatus
+    {
+        eReturnStatusInvalid,
+        eReturnStatusSuccessFinishNoResult,
+        eReturnStatusSuccessFinishResult,
+        eReturnStatusSuccessContinuingNoResult,
+        eReturnStatusSuccessContinuingResult,
+        eReturnStatusStarted,
+        eReturnStatusFailed,
+        eReturnStatusQuit
+    };
+
+
+    //----------------------------------------------------------------------
+    // The results of expression evaluation:
+    //----------------------------------------------------------------------
+    enum ExpressionResults
+    {
+        eExpressionCompleted = 0,
+        eExpressionSetupError,
+        eExpressionParseError,
+        eExpressionDiscarded,
+        eExpressionInterrupted,
+        eExpressionHitBreakpoint,
+        eExpressionTimedOut,
+        eExpressionResultUnavailable,
+        eExpressionStoppedForDebug
+    };
+
+    //----------------------------------------------------------------------
+    // Connection Status Types
+    //----------------------------------------------------------------------
+    enum ConnectionStatus
+    {
+        eConnectionStatusSuccess,         // Success
+        eConnectionStatusEndOfFile,       // End-of-file encountered
+        eConnectionStatusError,           // Check GetError() for details
+        eConnectionStatusTimedOut,        // Request timed out
+        eConnectionStatusNoConnection,    // No connection
+        eConnectionStatusLostConnection,  // Lost connection while connected to a valid connection
+        eConnectionStatusInterrupted      // Interrupted read
+    };
+
+    enum ErrorType
+    {
+        eErrorTypeInvalid,
+        eErrorTypeGeneric,      ///< Generic errors that can be any value.
+        eErrorTypeMachKernel,   ///< Mach kernel error codes.
+        eErrorTypePOSIX,        ///< POSIX error codes.
+        eErrorTypeExpression,   ///< These are from the ExpressionResults enum.
+        eErrorTypeWin32         ///< Standard Win32 error codes.
+    };
+
+
+    enum ValueType
+    {
+        eValueTypeInvalid           = 0,
+        eValueTypeVariableGlobal    = 1,    // globals variable
+        eValueTypeVariableStatic    = 2,    // static variable
+        eValueTypeVariableArgument  = 3,    // function argument variables
+        eValueTypeVariableLocal     = 4,    // function local variables
+        eValueTypeRegister          = 5,    // stack frame register value
+        eValueTypeRegisterSet       = 6,    // A collection of stack frame register values
+        eValueTypeConstResult       = 7     // constant result variables
+    };
+
+    //----------------------------------------------------------------------
+    // Token size/granularities for Input Readers
+    //----------------------------------------------------------------------
+
+    enum InputReaderGranularity
+    {
+        eInputReaderGranularityInvalid = 0,
+        eInputReaderGranularityByte,
+        eInputReaderGranularityWord,
+        eInputReaderGranularityLine,
+        eInputReaderGranularityAll
+    };
+
+    //------------------------------------------------------------------
+    /// These mask bits allow a common interface for queries that can
+    /// limit the amount of information that gets parsed to only the
+    /// information that is requested. These bits also can indicate what
+    /// actually did get resolved during query function calls.
+    ///
+    /// Each definition corresponds to a one of the member variables
+    /// in this class, and requests that that item be resolved, or
+    /// indicates that the member did get resolved.
+    //------------------------------------------------------------------
+    FLAGS_ENUM(SymbolContextItem)
+    {
+        eSymbolContextTarget     = (1u << 0), ///< Set when \a target is requested from a query, or was located in query results
+        eSymbolContextModule     = (1u << 1), ///< Set when \a module is requested from a query, or was located in query results
+        eSymbolContextCompUnit   = (1u << 2), ///< Set when \a comp_unit is requested from a query, or was located in query results
+        eSymbolContextFunction   = (1u << 3), ///< Set when \a function is requested from a query, or was located in query results
+        eSymbolContextBlock      = (1u << 4), ///< Set when the deepest \a block is requested from a query, or was located in query results
+        eSymbolContextLineEntry  = (1u << 5), ///< Set when \a line_entry is requested from a query, or was located in query results
+        eSymbolContextSymbol     = (1u << 6), ///< Set when \a symbol is requested from a query, or was located in query results
+        eSymbolContextEverything = ((eSymbolContextSymbol << 1) - 1u),  ///< Indicates to try and lookup everything up during a routine symbol context query.
+        eSymbolContextVariable   = (1u << 7)  ///< Set when \a global or static variable is requested from a query, or was located in query results.
+                                              ///< eSymbolContextVariable is potentially expensive to lookup so it isn't included in
+                                              ///< eSymbolContextEverything which stops it from being used during frame PC lookups and
+                                              ///< many other potential address to symbol context lookups.
+    };
+
+    FLAGS_ENUM(Permissions)
+    {
+        ePermissionsWritable    = (1u << 0),
+        ePermissionsReadable    = (1u << 1),
+        ePermissionsExecutable  = (1u << 2)
+    };
+
+    enum InputReaderAction
+    {
+        eInputReaderActivate,   // reader is newly pushed onto the reader stack 
+        eInputReaderAsynchronousOutputWritten, // an async output event occurred; the reader may want to do something
+        eInputReaderReactivate, // reader is on top of the stack again after another reader was popped off 
+        eInputReaderDeactivate, // another reader was pushed on the stack 
+        eInputReaderGotToken,   // reader got one of its tokens (granularity)
+        eInputReaderInterrupt,  // reader received an interrupt signal (probably from a control-c)
+        eInputReaderEndOfFile,  // reader received an EOF char (probably from a control-d)
+        eInputReaderDone        // reader was just popped off the stack and is done
+    };
+
+    FLAGS_ENUM(BreakpointEventType)
+    {
+        eBreakpointEventTypeInvalidType         = (1u << 0),
+        eBreakpointEventTypeAdded               = (1u << 1),
+        eBreakpointEventTypeRemoved             = (1u << 2),
+        eBreakpointEventTypeLocationsAdded      = (1u << 3),  // Locations added doesn't get sent when the breakpoint is created
+        eBreakpointEventTypeLocationsRemoved    = (1u << 4),
+        eBreakpointEventTypeLocationsResolved   = (1u << 5),
+        eBreakpointEventTypeEnabled             = (1u << 6),
+        eBreakpointEventTypeDisabled            = (1u << 7),
+        eBreakpointEventTypeCommandChanged      = (1u << 8),
+        eBreakpointEventTypeConditionChanged    = (1u << 9),
+        eBreakpointEventTypeIgnoreChanged       = (1u << 10),
+        eBreakpointEventTypeThreadChanged       = (1u << 11)
+    };
+
+    FLAGS_ENUM(WatchpointEventType)
+    {
+        eWatchpointEventTypeInvalidType         = (1u << 0),
+        eWatchpointEventTypeAdded               = (1u << 1),
+        eWatchpointEventTypeRemoved             = (1u << 2),
+        eWatchpointEventTypeEnabled             = (1u << 6),
+        eWatchpointEventTypeDisabled            = (1u << 7),
+        eWatchpointEventTypeCommandChanged      = (1u << 8),
+        eWatchpointEventTypeConditionChanged    = (1u << 9),
+        eWatchpointEventTypeIgnoreChanged       = (1u << 10),
+        eWatchpointEventTypeThreadChanged       = (1u << 11),
+        eWatchpointEventTypeTypeChanged         = (1u << 12)
+    };
+
+
+    //----------------------------------------------------------------------
+    /// Programming language type.
+    ///
+    /// These enumerations use the same language enumerations as the DWARF
+    /// specification for ease of use and consistency.
+    /// The enum -> string code is in LanguageRuntime.cpp, don't change this
+    /// table without updating that code as well.
+    //----------------------------------------------------------------------
+    enum LanguageType
+    {
+        eLanguageTypeUnknown         = 0x0000,   ///< Unknown or invalid language value.
+        eLanguageTypeC89             = 0x0001,   ///< ISO C:1989.
+        eLanguageTypeC               = 0x0002,   ///< Non-standardized C, such as K&R.
+        eLanguageTypeAda83           = 0x0003,   ///< ISO Ada:1983.
+        eLanguageTypeC_plus_plus     = 0x0004,   ///< ISO C++:1998.
+        eLanguageTypeCobol74         = 0x0005,   ///< ISO Cobol:1974.
+        eLanguageTypeCobol85         = 0x0006,   ///< ISO Cobol:1985.
+        eLanguageTypeFortran77       = 0x0007,   ///< ISO Fortran 77.
+        eLanguageTypeFortran90       = 0x0008,   ///< ISO Fortran 90.
+        eLanguageTypePascal83        = 0x0009,   ///< ISO Pascal:1983.
+        eLanguageTypeModula2         = 0x000a,   ///< ISO Modula-2:1996.
+        eLanguageTypeJava            = 0x000b,   ///< Java.
+        eLanguageTypeC99             = 0x000c,   ///< ISO C:1999.
+        eLanguageTypeAda95           = 0x000d,   ///< ISO Ada:1995.
+        eLanguageTypeFortran95       = 0x000e,   ///< ISO Fortran 95.
+        eLanguageTypePLI             = 0x000f,   ///< ANSI PL/I:1976.
+        eLanguageTypeObjC            = 0x0010,   ///< Objective-C.
+        eLanguageTypeObjC_plus_plus  = 0x0011,   ///< Objective-C++.
+        eLanguageTypeUPC             = 0x0012,   ///< Unified Parallel C.
+        eLanguageTypeD               = 0x0013,   ///< D.
+        eLanguageTypePython          = 0x0014,   ///< Python.
+        // NOTE: The below are DWARF5 constants, subject to change upon
+        // completion of the DWARF5 specification
+        eLanguageTypeOpenCL          = 0x0015,   ///< OpenCL.
+        eLanguageTypeGo              = 0x0016,   ///< Go.
+        eLanguageTypeModula3         = 0x0017,   ///< Modula 3.
+        eLanguageTypeHaskell         = 0x0018,   ///< Haskell.
+        eLanguageTypeC_plus_plus_03  = 0x0019,   ///< ISO C++:2003.
+        eLanguageTypeC_plus_plus_11  = 0x001a,   ///< ISO C++:2011.
+        eLanguageTypeOCaml           = 0x001b,   ///< OCaml.
+        eLanguageTypeRust            = 0x001c,   ///< Rust.
+        eLanguageTypeC11             = 0x001d,   ///< ISO C:2011.
+        eLanguageTypeSwift           = 0x001e,   ///< Swift.
+        eLanguageTypeJulia           = 0x001f,   ///< Julia.
+        eLanguageTypeDylan           = 0x0020,   ///< Dylan.
+        eLanguageTypeC_plus_plus_14  = 0x0021,   ///< ISO C++:2014.
+        eLanguageTypeFortran03       = 0x0022,   ///< ISO Fortran 2003.
+        eLanguageTypeFortran08       = 0x0023,   ///< ISO Fortran 2008.
+        // Vendor Extensions
+        // Note: LanguageRuntime::GetNameForLanguageType
+        // assumes these can be used as indexes into array language_names, and
+        // Language::SetLanguageFromCString and Language::AsCString
+        // assume these can be used as indexes into array g_languages.
+        eLanguageTypeMipsAssembler   = 0x0024,   ///< Mips_Assembler.
+        eLanguageTypeExtRenderScript = 0x0025,   ///< RenderScript.
+        eNumLanguageTypes
+    };
+    
+    enum InstrumentationRuntimeType
+    {
+        eInstrumentationRuntimeTypeAddressSanitizer = 0x0000,
+        eNumInstrumentationRuntimeTypes
+    };
+
+    enum DynamicValueType
+    {
+        eNoDynamicValues = 0,
+        eDynamicCanRunTarget    = 1,
+        eDynamicDontRunTarget   = 2
+    };
+    
+    enum AccessType
+    {
+        eAccessNone,
+        eAccessPublic,
+        eAccessPrivate,
+        eAccessProtected,
+        eAccessPackage
+    };
+
+   enum CommandArgumentType
+    {
+        eArgTypeAddress = 0,
+        eArgTypeAddressOrExpression,
+        eArgTypeAliasName,
+        eArgTypeAliasOptions,
+        eArgTypeArchitecture,
+        eArgTypeBoolean,
+        eArgTypeBreakpointID,
+        eArgTypeBreakpointIDRange,
+        eArgTypeBreakpointName,
+        eArgTypeByteSize,
+        eArgTypeClassName,
+        eArgTypeCommandName,
+        eArgTypeCount,
+        eArgTypeDescriptionVerbosity,
+        eArgTypeDirectoryName,
+        eArgTypeDisassemblyFlavor,
+        eArgTypeEndAddress,
+        eArgTypeExpression,
+        eArgTypeExpressionPath,
+        eArgTypeExprFormat,
+        eArgTypeFilename,
+        eArgTypeFormat,
+        eArgTypeFrameIndex,
+        eArgTypeFullName,
+        eArgTypeFunctionName,
+        eArgTypeFunctionOrSymbol,
+        eArgTypeGDBFormat,
+        eArgTypeHelpText,
+        eArgTypeIndex,
+        eArgTypeLanguage,
+        eArgTypeLineNum,
+        eArgTypeLogCategory,
+        eArgTypeLogChannel,
+        eArgTypeMethod,
+        eArgTypeName,
+        eArgTypeNewPathPrefix,
+        eArgTypeNumLines,
+        eArgTypeNumberPerLine,
+        eArgTypeOffset,
+        eArgTypeOldPathPrefix,
+        eArgTypeOneLiner,
+        eArgTypePath,
+        eArgTypePermissionsNumber,
+        eArgTypePermissionsString,
+        eArgTypePid,
+        eArgTypePlugin,
+        eArgTypeProcessName,
+        eArgTypePythonClass,
+        eArgTypePythonFunction,
+        eArgTypePythonScript,
+        eArgTypeQueueName,
+        eArgTypeRegisterName,
+        eArgTypeRegularExpression,
+        eArgTypeRunArgs,
+        eArgTypeRunMode,
+        eArgTypeScriptedCommandSynchronicity,
+        eArgTypeScriptLang,
+        eArgTypeSearchWord,
+        eArgTypeSelector,
+        eArgTypeSettingIndex,
+        eArgTypeSettingKey,
+        eArgTypeSettingPrefix,
+        eArgTypeSettingVariableName,
+        eArgTypeShlibName,
+        eArgTypeSourceFile,
+        eArgTypeSortOrder,
+        eArgTypeStartAddress,
+        eArgTypeSummaryString,
+        eArgTypeSymbol,
+        eArgTypeThreadID,
+        eArgTypeThreadIndex,
+        eArgTypeThreadName,
+        eArgTypeTypeName,
+        eArgTypeUnsignedInteger,
+        eArgTypeUnixSignal,
+        eArgTypeVarName,
+        eArgTypeValue,
+        eArgTypeWidth,
+        eArgTypeNone,
+        eArgTypePlatform,
+        eArgTypeWatchpointID,
+        eArgTypeWatchpointIDRange,
+        eArgTypeWatchType,
+        eArgTypeLastArg  // Always keep this entry as the last entry in this enumeration!!
+    };
+
+    //----------------------------------------------------------------------
+    // Symbol types
+    //----------------------------------------------------------------------
+    enum SymbolType
+    {
+        eSymbolTypeAny = 0,
+        eSymbolTypeInvalid = 0,
+        eSymbolTypeAbsolute,
+        eSymbolTypeCode,
+        eSymbolTypeResolver,
+        eSymbolTypeData,
+        eSymbolTypeTrampoline,
+        eSymbolTypeRuntime,
+        eSymbolTypeException,
+        eSymbolTypeSourceFile,
+        eSymbolTypeHeaderFile,
+        eSymbolTypeObjectFile,
+        eSymbolTypeCommonBlock,
+        eSymbolTypeBlock,
+        eSymbolTypeLocal,
+        eSymbolTypeParam,
+        eSymbolTypeVariable,
+        eSymbolTypeVariableType,
+        eSymbolTypeLineEntry,
+        eSymbolTypeLineHeader,
+        eSymbolTypeScopeBegin,
+        eSymbolTypeScopeEnd,
+        eSymbolTypeAdditional, // When symbols take more than one entry, the extra entries get this type
+        eSymbolTypeCompiler,
+        eSymbolTypeInstrumentation,
+        eSymbolTypeUndefined,
+        eSymbolTypeObjCClass,
+        eSymbolTypeObjCMetaClass,
+        eSymbolTypeObjCIVar,
+        eSymbolTypeReExported
+    };
+    
+    enum SectionType
+    {
+        eSectionTypeInvalid,
+        eSectionTypeCode,
+        eSectionTypeContainer,              // The section contains child sections
+        eSectionTypeData,
+        eSectionTypeDataCString,            // Inlined C string data
+        eSectionTypeDataCStringPointers,    // Pointers to C string data
+        eSectionTypeDataSymbolAddress,      // Address of a symbol in the symbol table
+        eSectionTypeData4,
+        eSectionTypeData8,
+        eSectionTypeData16,
+        eSectionTypeDataPointers,
+        eSectionTypeDebug,
+        eSectionTypeZeroFill,
+        eSectionTypeDataObjCMessageRefs,    // Pointer to function pointer + selector
+        eSectionTypeDataObjCCFStrings,      // Objective C const CFString/NSString objects
+        eSectionTypeDWARFDebugAbbrev,
+        eSectionTypeDWARFDebugAranges,
+        eSectionTypeDWARFDebugFrame,
+        eSectionTypeDWARFDebugInfo,
+        eSectionTypeDWARFDebugLine,
+        eSectionTypeDWARFDebugLoc,
+        eSectionTypeDWARFDebugMacInfo,
+        eSectionTypeDWARFDebugPubNames,
+        eSectionTypeDWARFDebugPubTypes,
+        eSectionTypeDWARFDebugRanges,
+        eSectionTypeDWARFDebugStr,
+        eSectionTypeDWARFAppleNames,
+        eSectionTypeDWARFAppleTypes,
+        eSectionTypeDWARFAppleNamespaces,
+        eSectionTypeDWARFAppleObjC,
+        eSectionTypeELFSymbolTable,       // Elf SHT_SYMTAB section
+        eSectionTypeELFDynamicSymbols,    // Elf SHT_DYNSYM section
+        eSectionTypeELFRelocationEntries, // Elf SHT_REL or SHT_REL section
+        eSectionTypeELFDynamicLinkInfo,   // Elf SHT_DYNAMIC section
+        eSectionTypeEHFrame,
+        eSectionTypeCompactUnwind,        // compact unwind section in Mach-O, __TEXT,__unwind_info
+        eSectionTypeOther
+    };
+
+    FLAGS_ENUM(EmulateInstructionOptions)
+    {
+        eEmulateInstructionOptionNone               = (0u),
+        eEmulateInstructionOptionAutoAdvancePC      = (1u << 0),
+        eEmulateInstructionOptionIgnoreConditions   = (1u << 1)
+    };
+
+    FLAGS_ENUM(FunctionNameType)
+    {
+        eFunctionNameTypeNone       = 0u,
+        eFunctionNameTypeAuto       = (1u << 1),    // Automatically figure out which FunctionNameType
+                                                    // bits to set based on the function name.
+        eFunctionNameTypeFull       = (1u << 2),    // The function name.
+                                                    // For C this is the same as just the name of the function
+                                                    // For C++ this is the mangled or demangled version of the mangled name.
+                                                    // For ObjC this is the full function signature with the + or
+                                                    // - and the square brackets and the class and selector
+        eFunctionNameTypeBase       = (1u << 3),    // The function name only, no namespaces or arguments and no class 
+                                                    // methods or selectors will be searched.
+        eFunctionNameTypeMethod     = (1u << 4),    // Find function by method name (C++) with no namespace or arguments
+        eFunctionNameTypeSelector   = (1u << 5),    // Find function by selector name (ObjC) names
+        eFunctionNameTypeAny        = eFunctionNameTypeAuto // DEPRECATED: use eFunctionNameTypeAuto
+    };
+    
+    
+    //----------------------------------------------------------------------
+    // Basic types enumeration for the public API SBType::GetBasicType()
+    //----------------------------------------------------------------------
+    enum BasicType
+    {
+		eBasicTypeInvalid = 0,
+        eBasicTypeVoid = 1,
+        eBasicTypeChar,
+        eBasicTypeSignedChar,
+        eBasicTypeUnsignedChar,
+        eBasicTypeWChar,
+        eBasicTypeSignedWChar,
+        eBasicTypeUnsignedWChar,
+        eBasicTypeChar16,
+        eBasicTypeChar32,
+        eBasicTypeShort,
+        eBasicTypeUnsignedShort,
+        eBasicTypeInt,
+        eBasicTypeUnsignedInt,
+        eBasicTypeLong,
+        eBasicTypeUnsignedLong,
+        eBasicTypeLongLong,
+        eBasicTypeUnsignedLongLong,
+        eBasicTypeInt128,
+        eBasicTypeUnsignedInt128,
+        eBasicTypeBool,
+        eBasicTypeHalf,
+        eBasicTypeFloat,
+        eBasicTypeDouble,
+        eBasicTypeLongDouble,
+        eBasicTypeFloatComplex,
+        eBasicTypeDoubleComplex,
+        eBasicTypeLongDoubleComplex,
+        eBasicTypeObjCID,
+        eBasicTypeObjCClass,
+        eBasicTypeObjCSel,
+        eBasicTypeNullPtr,
+        eBasicTypeOther
+    };
+
+    FLAGS_ENUM(TypeClass)
+    {
+        eTypeClassInvalid           = (0u),
+        eTypeClassArray             = (1u << 0),
+        eTypeClassBlockPointer      = (1u << 1),
+        eTypeClassBuiltin           = (1u << 2),
+        eTypeClassClass             = (1u << 3),
+        eTypeClassComplexFloat      = (1u << 4),
+        eTypeClassComplexInteger    = (1u << 5),
+        eTypeClassEnumeration       = (1u << 6),
+        eTypeClassFunction          = (1u << 7),
+        eTypeClassMemberPointer     = (1u << 8),
+        eTypeClassObjCObject        = (1u << 9),
+        eTypeClassObjCInterface     = (1u << 10),
+        eTypeClassObjCObjectPointer = (1u << 11),
+        eTypeClassPointer           = (1u << 12),
+        eTypeClassReference         = (1u << 13),
+        eTypeClassStruct            = (1u << 14),
+        eTypeClassTypedef           = (1u << 15),
+        eTypeClassUnion             = (1u << 16),
+        eTypeClassVector            = (1u << 17),
+        // Define the last type class as the MSBit of a 32 bit value
+        eTypeClassOther             = (1u << 31),
+        // Define a mask that can be used for any type when finding types
+        eTypeClassAny               = (0xffffffffu)
+    };
+
+    enum TemplateArgumentKind
+    {
+        eTemplateArgumentKindNull = 0,
+        eTemplateArgumentKindType,
+        eTemplateArgumentKindDeclaration,
+        eTemplateArgumentKindIntegral,
+        eTemplateArgumentKindTemplate,
+        eTemplateArgumentKindTemplateExpansion,
+        eTemplateArgumentKindExpression,
+        eTemplateArgumentKindPack
+
+    };
+
+    //----------------------------------------------------------------------
+    // Options that can be set for a formatter to alter its behavior
+    // Not all of these are applicable to all formatter types
+    //----------------------------------------------------------------------
+    FLAGS_ENUM(TypeOptions)
+    {
+        eTypeOptionNone            = (0u),
+        eTypeOptionCascade         = (1u << 0),
+        eTypeOptionSkipPointers    = (1u << 1),
+        eTypeOptionSkipReferences  = (1u << 2),
+        eTypeOptionHideChildren    = (1u << 3),
+        eTypeOptionHideValue       = (1u << 4),
+        eTypeOptionShowOneLiner    = (1u << 5),
+        eTypeOptionHideNames       = (1u << 6)
+    };
+
+   //----------------------------------------------------------------------
+   // This is the return value for frame comparisons.  If you are comparing frame A to frame B
+   // the following cases arise:
+   // 1) When frame A pushes frame B (or a frame that ends up pushing B) A is Older than B.
+   // 2) When frame A pushed frame B (or if frame A is on the stack but B is not) A is Younger than B
+   // 3) When frame A and frame B have the same StackID, they are Equal.
+   // 4) When frame A and frame B have the same immediate parent frame, but are not equal, the comparision yields
+   //    SameParent.
+   // 5) If the two frames are on different threads or processes the comparision is Invalid
+   // 6) If for some reason we can't figure out what went on, we return Unknown.
+   //----------------------------------------------------------------------
+   enum FrameComparison
+   {
+       eFrameCompareInvalid,
+       eFrameCompareUnknown,
+       eFrameCompareEqual,
+       eFrameCompareSameParent,
+       eFrameCompareYounger,
+       eFrameCompareOlder
+   };
+   
+    //----------------------------------------------------------------------
+    // Address Class
+    //
+    // A way of classifying an address used for disassembling and setting 
+    // breakpoints. Many object files can track exactly what parts of their
+    // object files are code, data and other information. This is of course
+    // above and beyond just looking at the section types. For example, code
+    // might contain PC relative data and the object file might be able to
+    // tell us that an address in code is data.
+    //----------------------------------------------------------------------
+    enum AddressClass
+    {
+        eAddressClassInvalid,
+        eAddressClassUnknown,
+        eAddressClassCode,
+        eAddressClassCodeAlternateISA,
+        eAddressClassData,
+        eAddressClassDebug,
+        eAddressClassRuntime
+    };
+
+    //----------------------------------------------------------------------
+    // File Permissions
+    //
+    // Designed to mimic the unix file permission bits so they can be
+    // used with functions that set 'mode_t' to certain values for
+    // permissions.
+    //----------------------------------------------------------------------
+    FLAGS_ENUM(FilePermissions)
+    {
+        eFilePermissionsUserRead        = (1u << 8),
+        eFilePermissionsUserWrite       = (1u << 7),
+        eFilePermissionsUserExecute     = (1u << 6),
+        eFilePermissionsGroupRead       = (1u << 5),
+        eFilePermissionsGroupWrite      = (1u << 4),
+        eFilePermissionsGroupExecute    = (1u << 3),
+        eFilePermissionsWorldRead       = (1u << 2),
+        eFilePermissionsWorldWrite      = (1u << 1),
+        eFilePermissionsWorldExecute    = (1u << 0),
+        
+        eFilePermissionsUserRW      = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | 0                             ),
+        eFileFilePermissionsUserRX  = (eFilePermissionsUserRead    | 0                              | eFilePermissionsUserExecute   ),
+        eFilePermissionsUserRWX     = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | eFilePermissionsUserExecute   ),
+            
+        eFilePermissionsGroupRW     = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | 0                             ),
+        eFilePermissionsGroupRX     = (eFilePermissionsGroupRead   | 0                              | eFilePermissionsGroupExecute  ),
+        eFilePermissionsGroupRWX    = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | eFilePermissionsGroupExecute  ),
+        
+        eFilePermissionsWorldRW     = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | 0                             ),
+        eFilePermissionsWorldRX     = (eFilePermissionsWorldRead   | 0                              | eFilePermissionsWorldExecute  ),
+        eFilePermissionsWorldRWX    = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | eFilePermissionsWorldExecute  ),
+        
+        eFilePermissionsEveryoneR   = (eFilePermissionsUserRead    | eFilePermissionsGroupRead      | eFilePermissionsWorldRead     ),
+        eFilePermissionsEveryoneW   = (eFilePermissionsUserWrite   | eFilePermissionsGroupWrite     | eFilePermissionsWorldWrite    ),
+        eFilePermissionsEveryoneX   = (eFilePermissionsUserExecute | eFilePermissionsGroupExecute   | eFilePermissionsWorldExecute  ),
+        
+        eFilePermissionsEveryoneRW  = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | 0                             ),
+        eFilePermissionsEveryoneRX  = (eFilePermissionsEveryoneR   | 0                              | eFilePermissionsEveryoneX     ),
+        eFilePermissionsEveryoneRWX = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | eFilePermissionsEveryoneX     ),
+        eFilePermissionsFileDefault = eFilePermissionsUserRW,
+        eFilePermissionsDirectoryDefault = eFilePermissionsUserRWX,
+    };
+
+    //----------------------------------------------------------------------
+    // Queue work item types
+    //
+    // The different types of work that can be enqueued on a libdispatch
+    // aka Grand Central Dispatch (GCD) queue.
+    //----------------------------------------------------------------------
+    enum QueueItemKind
+    {
+        eQueueItemKindUnknown = 0,
+        eQueueItemKindFunction,
+        eQueueItemKindBlock
+    };
+
+    //----------------------------------------------------------------------
+    // Queue type
+    // libdispatch aka Grand Central Dispatch (GCD) queues can be either serial
+    // (executing on one thread) or concurrent (executing on multiple threads).
+    //----------------------------------------------------------------------
+    enum QueueKind
+    {
+        eQueueKindUnknown = 0,
+        eQueueKindSerial,
+        eQueueKindConcurrent
+    };
+    
+    //----------------------------------------------------------------------
+    // Expression Evaluation Stages
+    // These are the cancellable stages of expression evaluation, passed to the
+    // expression evaluation callback, so that you can interrupt expression
+    // evaluation at the various points in its lifecycle.
+    //----------------------------------------------------------------------
+    enum ExpressionEvaluationPhase
+    {
+        eExpressionEvaluationParse = 0,
+        eExpressionEvaluationIRGen,
+        eExpressionEvaluationExecution,
+        eExpressionEvaluationComplete
+    };
+    
+
+    //----------------------------------------------------------------------
+    // Watchpoint Kind
+    // Indicates what types of events cause the watchpoint to fire.
+    // Used by Native*Protocol-related classes.
+    //----------------------------------------------------------------------
+    FLAGS_ENUM(WatchpointKind)
+    {
+        eWatchpointKindRead = (1u << 0),
+        eWatchpointKindWrite = (1u << 1)
+    };
+
+    enum GdbSignal
+    {
+        eGdbSignalBadAccess      = 0x91,
+        eGdbSignalBadInstruction = 0x92,
+        eGdbSignalArithmetic     = 0x93,
+        eGdbSignalEmulation      = 0x94,
+        eGdbSignalSoftware       = 0x95,
+        eGdbSignalBreakpoint     = 0x96
+    };
+
+    //----------------------------------------------------------------------
+    // Used with SBHost::GetPath (lldb::PathType) to find files that are
+    // related to LLDB on the current host machine. Most files are relative
+    // to LLDB or are in known locations.
+    //----------------------------------------------------------------------
+    enum PathType
+    {
+        ePathTypeLLDBShlibDir,            // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
+        ePathTypeSupportExecutableDir,    // Find LLDB support executable directory (debugserver, etc)
+        ePathTypeHeaderDir,               // Find LLDB header file directory
+        ePathTypePythonDir,               // Find Python modules (PYTHONPATH) directory
+        ePathTypeLLDBSystemPlugins,       // System plug-ins directory
+        ePathTypeLLDBUserPlugins,         // User plug-ins directory
+        ePathTypeLLDBTempSystemDir,       // The LLDB temp directory for this system that will be cleaned up on exit
+        ePathTypeGlobalLLDBTempSystemDir, // The LLDB temp directory for this system, NOT cleaned up on a process exit.
+        ePathTypeClangDir                 // Find path to Clang builtin headers
+    };
+    
+    //----------------------------------------------------------------------
+    // Kind of member function
+    // Used by the type system
+    //----------------------------------------------------------------------
+    enum MemberFunctionKind
+    {
+        eMemberFunctionKindUnknown = 0,     // Not sure what the type of this is
+        eMemberFunctionKindConstructor,     // A function used to create instances
+        eMemberFunctionKindDestructor,      // A function used to tear down existing instances
+        eMemberFunctionKindInstanceMethod,  // A function that applies to a specific instance
+        eMemberFunctionKindStaticMethod     // A function that applies to a type rather than any instance
+    };
+
+
+    //----------------------------------------------------------------------
+    // String matching algorithm used by SBTarget
+    //----------------------------------------------------------------------
+    enum MatchType
+    {
+        eMatchTypeNormal,
+        eMatchTypeRegex,
+        eMatchTypeStartsWith
+    };
+    
+    //----------------------------------------------------------------------
+    // Bitmask that describes details about a type
+    //----------------------------------------------------------------------
+    FLAGS_ENUM(TypeFlags)
+    {
+        eTypeHasChildren        = (1u <<  0),
+        eTypeHasValue           = (1u <<  1),
+        eTypeIsArray            = (1u <<  2),
+        eTypeIsBlock            = (1u <<  3),
+        eTypeIsBuiltIn          = (1u <<  4),
+        eTypeIsClass            = (1u <<  5),
+        eTypeIsCPlusPlus        = (1u <<  6),
+        eTypeIsEnumeration      = (1u <<  7),
+        eTypeIsFuncPrototype    = (1u <<  8),
+        eTypeIsMember           = (1u <<  9),
+        eTypeIsObjC             = (1u << 10),
+        eTypeIsPointer          = (1u << 11),
+        eTypeIsReference        = (1u << 12),
+        eTypeIsStructUnion      = (1u << 13),
+        eTypeIsTemplate         = (1u << 14),
+        eTypeIsTypedef          = (1u << 15),
+        eTypeIsVector           = (1u << 16),
+        eTypeIsScalar           = (1u << 17),
+        eTypeIsInteger          = (1u << 18),
+        eTypeIsFloat            = (1u << 19),
+        eTypeIsComplex          = (1u << 20),
+        eTypeIsSigned           = (1u << 21)
+    };
+    
+    FLAGS_ENUM(CommandFlags)
+    {
+        //----------------------------------------------------------------------
+        // eCommandRequiresTarget
+        //
+        // Ensures a valid target is contained in m_exe_ctx prior to executing
+        // the command. If a target doesn't exist or is invalid, the command
+        // will fail and CommandObject::GetInvalidTargetDescription() will be
+        // returned as the error. CommandObject subclasses can override the
+        // virtual function for GetInvalidTargetDescription() to provide custom
+        // strings when needed.
+        //----------------------------------------------------------------------
+        eCommandRequiresTarget         = (1u << 0),
+        //----------------------------------------------------------------------
+        // eCommandRequiresProcess
+        //
+        // Ensures a valid process is contained in m_exe_ctx prior to executing
+        // the command. If a process doesn't exist or is invalid, the command
+        // will fail and CommandObject::GetInvalidProcessDescription() will be
+        // returned as the error. CommandObject subclasses can override the
+        // virtual function for GetInvalidProcessDescription() to provide custom
+        // strings when needed.
+        //----------------------------------------------------------------------
+        eCommandRequiresProcess        = (1u << 1),
+        //----------------------------------------------------------------------
+        // eCommandRequiresThread
+        //
+        // Ensures a valid thread is contained in m_exe_ctx prior to executing
+        // the command. If a thread doesn't exist or is invalid, the command
+        // will fail and CommandObject::GetInvalidThreadDescription() will be
+        // returned as the error. CommandObject subclasses can override the
+        // virtual function for GetInvalidThreadDescription() to provide custom
+        // strings when needed.
+        //----------------------------------------------------------------------
+        eCommandRequiresThread         = (1u << 2),
+        //----------------------------------------------------------------------
+        // eCommandRequiresFrame
+        //
+        // Ensures a valid frame is contained in m_exe_ctx prior to executing
+        // the command. If a frame doesn't exist or is invalid, the command
+        // will fail and CommandObject::GetInvalidFrameDescription() will be
+        // returned as the error. CommandObject subclasses can override the
+        // virtual function for GetInvalidFrameDescription() to provide custom
+        // strings when needed.
+        //----------------------------------------------------------------------
+        eCommandRequiresFrame          = (1u << 3),
+        //----------------------------------------------------------------------
+        // eCommandRequiresRegContext
+        //
+        // Ensures a valid register context (from the selected frame if there
+        // is a frame in m_exe_ctx, or from the selected thread from m_exe_ctx)
+        // is available from m_exe_ctx prior to executing the command. If a
+        // target doesn't exist or is invalid, the command will fail and
+        // CommandObject::GetInvalidRegContextDescription() will be returned as
+        // the error. CommandObject subclasses can override the virtual function
+        // for GetInvalidRegContextDescription() to provide custom strings when
+        // needed.
+        //----------------------------------------------------------------------
+        eCommandRequiresRegContext     = (1u << 4),
+        //----------------------------------------------------------------------
+        // eCommandTryTargetAPILock
+        //
+        // Attempts to acquire the target lock if a target is selected in the
+        // command interpreter. If the command object fails to acquire the API
+        // lock, the command will fail with an appropriate error message.
+        //----------------------------------------------------------------------
+        eCommandTryTargetAPILock       = (1u << 5),
+        //----------------------------------------------------------------------
+        // eCommandProcessMustBeLaunched
+        //
+        // Verifies that there is a launched process in m_exe_ctx, if there
+        // isn't, the command will fail with an appropriate error message.
+        //----------------------------------------------------------------------
+        eCommandProcessMustBeLaunched  = (1u << 6),
+        //----------------------------------------------------------------------
+        // eCommandProcessMustBePaused
+        //
+        // Verifies that there is a paused process in m_exe_ctx, if there
+        // isn't, the command will fail with an appropriate error message.
+        //----------------------------------------------------------------------
+        eCommandProcessMustBePaused    = (1u << 7)
+    };
+    
+    //----------------------------------------------------------------------
+    // Whether a summary should cap how much data it returns to users or not
+    //----------------------------------------------------------------------
+    enum TypeSummaryCapping
+    {
+        eTypeSummaryCapped = true,
+        eTypeSummaryUncapped = false
+    };
+
+} // namespace lldb
+
+#endif  // LLDB_lldb_enumerations_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-forward.h b/kcov-38/external/lldb/include/lldb/lldb-forward.h
new file mode 100644
index 000000000000..e0c2ae4b8b8d
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/lldb-forward.h
@@ -0,0 +1,440 @@
+//===-- lldb-forward.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_lldb_forward_h_
+#define LLDB_lldb_forward_h_
+
+#if defined(__cplusplus)
+
+#include "lldb/Utility/SharingPtr.h"
+
+//----------------------------------------------------------------------
+// lldb forward declarations
+//----------------------------------------------------------------------
+namespace lldb_private {
+
+class   ABI;
+class   Address;
+class   AddressImpl;
+class   AddressRange;
+class   AddressResolver;
+class   ArchSpec;
+class   Args;
+class   ASTResultSynthesizer;
+class   Baton;
+class   Block;
+class   Breakpoint;
+class   BreakpointID;
+class   BreakpointIDList;
+class   BreakpointList;
+class   BreakpointLocation;
+class   BreakpointLocationCollection;
+class   BreakpointLocationList;
+class   BreakpointOptions;
+class   BreakpointResolver;
+class   BreakpointSite;
+class   BreakpointSiteList;
+class   BroadcastEventSpec;
+class   Broadcaster;
+class   BroadcasterManager;
+class   CPPLanguageRuntime;
+class   ClangASTContext;
+class   ClangASTImporter;
+class   ClangASTMetadata;
+class   ClangASTSource;
+class   ClangASTType;
+class   ClangNamespaceDecl;
+class   ClangExpression;
+class   ClangExpressionDeclMap;
+class   ClangExpressionParser;
+class   ClangExpressionVariable;
+class   ClangExpressionVariableList;
+class   ClangExpressionVariableList;
+class   ClangExpressionVariables;
+class   ClangFunction;
+class   ClangModulesDeclVendor;
+class   ClangPersistentVariables;
+class   ClangUserExpression;
+class   ClangUtilityFunction;
+class   CommandInterpreter;
+class   CommandInterpreterRunOptions;
+class   CommandObject;
+class   CommandReturnObject;
+class   Communication;
+class   CompactUnwindInfo;
+class   CompileUnit;
+class   Condition;
+class   Connection;
+class   ConnectionFileDescriptor;
+class   ConstString;
+class   CXXSyntheticChildren;
+class   DWARFCallFrameInfo;
+class   DWARFExpression;
+class   DataBuffer;
+class   DataEncoder;
+class   DataExtractor;
+class   Debugger;
+class   Declaration;
+class   Disassembler;
+struct  DumpValueObjectOptions;
+class   DynamicCheckerFunctions;
+class   DynamicLoader;
+class   Editline;
+class   EmulateInstruction;
+class   Error;
+class   EvaluateExpressionOptions;
+class   Event;
+class   EventData;
+class   ExecutionContext;
+class   ExecutionContextRef;
+class   ExecutionContextRefLocker;
+class   ExecutionContextScope;
+class   File;
+class   FileSpec;
+class   FileSpecList;
+class   Flags;
+class   TypeCategoryImpl;
+class   FormatManager;
+class   FormattersMatchCandidate;
+class   FuncUnwinders;
+class   Function;
+class   FunctionInfo;
+class   InlineFunctionInfo;
+class   Instruction;
+class   InstructionList;
+class   InstrumentationRuntime;
+class   IOHandler;
+class   IOObject;
+class   IRExecutionUnit;
+class   JITLoader;
+class   JITLoaderList;
+class   LanguageRuntime;
+class   MemoryRegionInfo;
+class   LineTable;
+class   Listener;
+class   Log;
+class   LogChannel;
+class   Mangled;
+class   Materializer;
+class   MemoryHistory;
+class   Module;
+class   ModuleList;
+class   ModuleSpec;
+class   ModuleSpecList;
+class   Mutex;
+struct  NameSearchContext;
+class   ObjCLanguageRuntime;
+class   ObjectContainer;
+class   OptionGroup;
+class   OptionGroupOptions;
+class   OptionGroupPlatform;
+class   ObjectFile;
+class   ObjectFileJITDelegate;
+class   OperatingSystem;
+class   Options;
+class   OptionValue;
+class   OptionValueArch;
+class   OptionValueArgs;
+class   OptionValueArray;
+class   OptionValueBoolean;
+class   OptionValueChar;
+class   OptionValueDictionary;
+class   OptionValueEnumeration;
+class   OptionValueFileSpec;
+class   OptionValueFileSpecList;
+class   OptionValueFormat;
+class   OptionValueLanguage;
+class   OptionValueFormatEntity;
+class   OptionValuePathMappings;
+class   OptionValueProperties;
+class   OptionValueRegex;
+class   OptionValueSInt64;
+class   OptionValueString;
+class   OptionValueUInt64;
+class   OptionValueUUID;
+class   NamedOption;
+class   PathMappingList;
+class   Platform;
+class   Process;
+class   ProcessAttachInfo;
+class   ProcessModID;
+class   ProcessInfo;
+class   ProcessInstanceInfo;
+class   ProcessInstanceInfoList;
+class   ProcessInstanceInfoMatch;
+class   ProcessLaunchInfo;
+class   Property;
+struct  PropertyDefinition;
+class   RegisterCheckpoint;
+class   RegisterContext;
+class   RegisterLocation;
+class   RegisterLocationList;
+class   RegisterValue;
+class   RegularExpression;
+class   Scalar;
+class   ScriptInterpreter;
+class   ScriptInterpreterLocker;
+#ifndef LLDB_DISABLE_PYTHON
+struct  ScriptSummaryFormat;
+#endif
+class   SearchFilter;
+class   Section;
+class   SectionImpl;
+class   SectionList;
+class   SectionLoadHistory;
+class   SectionLoadList;
+class   Settings;
+class   SourceManager;
+class   SourceManagerImpl;
+class   StackFrame;
+class   StackFrameImpl;
+class   StackFrameList;
+class   StackID;
+class   StopInfo;
+class   Stoppoint;
+class   StoppointCallbackContext;
+class   StoppointLocation;
+class   Stream;
+template <unsigned N> class StreamBuffer;
+class   StreamFile;
+class   StreamString;
+class   StringList;
+struct  StringSummaryFormat;
+class   SystemRuntime;
+class   TypeSummaryImpl;
+class   TypeSummaryOptions;
+class   Symbol;
+class   SymbolContext;
+class   SymbolContextList;
+class   SymbolContextScope;
+class   SymbolContextSpecifier;
+class   SymbolFile;
+class   SymbolFileType;
+class   SymbolVendor;
+class   Symtab;
+class   SyntheticChildren;
+class   SyntheticChildrenFrontEnd;
+class   TypeFilterImpl;
+#ifndef LLDB_DISABLE_PYTHON
+class   ScriptedSyntheticChildren;
+#endif
+class   Queue;
+class   QueueItem;
+class   QueueImpl;
+class   Target;
+class   TargetList;
+class   TargetProperties;
+class   Thread;
+class   ThreadCollection;
+class   ThreadList;
+class   ThreadPlan;
+class   ThreadPlanBase;
+class   ThreadPlanRunToAddress;
+class   ThreadPlanStepInstruction;
+class   ThreadPlanStepOut;
+class   ThreadPlanStepOverBreakpoint;
+class   ThreadPlanStepRange;
+class   ThreadPlanStepThrough;
+class   ThreadPlanTracer;
+class   ThreadSpec;
+class   TimeValue;
+class   Type;
+class   TypeAndOrName;
+class   TypeCategoryMap;
+class   TypeImpl;
+class   TypeList;
+class   TypeListImpl;
+class   TypeMemberImpl;
+class   TypeMemberFunctionImpl;
+class   TypeEnumMemberImpl;
+class   TypeEnumMemberListImpl;
+class   TypeFormatImpl;
+class   TypeNameSpecifierImpl;
+class   TypePair;
+class   TypeValidatorImpl;
+class   UUID;
+class   UnixSignals;
+class   Unwind;
+class   UnwindAssembly;
+class   UnwindPlan;
+class   UnwindTable;
+class   VMRange;
+class   Value;
+class   ValueList;
+class   ValueObject;
+class   ValueObjectChild;
+class   ValueObjectConstResult;
+class   ValueObjectConstResultChild;
+class   ValueObjectConstResultImpl;
+class   ValueObjectList;
+class   ValueObjectPrinter;
+class   Variable;
+class   VariableList;
+class   Watchpoint;
+class   WatchpointList;
+class   WatchpointOptions;
+struct  LineEntry;
+
+} // namespace lldb_private
+
+//----------------------------------------------------------------------
+// lldb forward declarations
+//----------------------------------------------------------------------
+namespace lldb {
+    
+    typedef std::shared_ptr<lldb_private::ABI> ABISP;
+    typedef std::shared_ptr<lldb_private::Baton> BatonSP;
+    typedef std::shared_ptr<lldb_private::Block> BlockSP;
+    typedef std::shared_ptr<lldb_private::Breakpoint> BreakpointSP;
+    typedef std::weak_ptr<lldb_private::Breakpoint> BreakpointWP;
+    typedef std::shared_ptr<lldb_private::BreakpointSite> BreakpointSiteSP;
+    typedef std::weak_ptr<lldb_private::BreakpointSite> BreakpointSiteWP;
+    typedef std::shared_ptr<lldb_private::BreakpointLocation> BreakpointLocationSP;
+    typedef std::weak_ptr<lldb_private::BreakpointLocation> BreakpointLocationWP;
+    typedef std::shared_ptr<lldb_private::BreakpointResolver> BreakpointResolverSP;
+    typedef std::shared_ptr<lldb_private::Broadcaster> BroadcasterSP;
+    typedef std::unique_ptr<lldb_private::ClangASTContext> ClangASTContextUP;
+    typedef std::unique_ptr<lldb_private::ClangASTImporter> ClangASTImporterUP;
+    typedef std::unique_ptr<lldb_private::ClangASTSource> ClangASTSourceUP;
+    typedef std::shared_ptr<lldb_private::ClangExpressionVariable> ClangExpressionVariableSP;
+    typedef std::unique_ptr<lldb_private::ClangModulesDeclVendor> ClangModulesDeclVendorUP;
+    typedef std::unique_ptr<lldb_private::ClangPersistentVariables> ClangPersistentVariablesUP;
+    typedef std::shared_ptr<lldb_private::ClangUserExpression> ClangUserExpressionSP;
+    typedef std::shared_ptr<lldb_private::CommandObject> CommandObjectSP;
+    typedef std::shared_ptr<lldb_private::Communication> CommunicationSP;
+    typedef std::shared_ptr<lldb_private::Connection> ConnectionSP;
+    typedef std::shared_ptr<lldb_private::CompileUnit> CompUnitSP;
+    typedef std::shared_ptr<lldb_private::DataBuffer> DataBufferSP;
+    typedef std::shared_ptr<lldb_private::DataExtractor> DataExtractorSP;
+    typedef std::shared_ptr<lldb_private::Debugger> DebuggerSP;
+    typedef std::weak_ptr<lldb_private::Debugger> DebuggerWP;
+    typedef std::shared_ptr<lldb_private::Disassembler> DisassemblerSP;
+    typedef std::unique_ptr<lldb_private::DynamicCheckerFunctions> DynamicCheckerFunctionsUP;
+    typedef std::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
+    typedef std::unique_ptr<lldb_private::DynamicLoader> DynamicLoaderUP;
+    typedef std::shared_ptr<lldb_private::Event> EventSP;
+    typedef std::shared_ptr<lldb_private::ExecutionContextRef> ExecutionContextRefSP;
+    typedef std::shared_ptr<lldb_private::File> FileSP;
+    typedef std::shared_ptr<lldb_private::Function> FunctionSP;
+    typedef std::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
+    typedef std::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
+    typedef std::shared_ptr<lldb_private::Instruction> InstructionSP;
+    typedef std::shared_ptr<lldb_private::InstrumentationRuntime> InstrumentationRuntimeSP;
+    typedef std::shared_ptr<lldb_private::IOHandler> IOHandlerSP;
+    typedef std::shared_ptr<lldb_private::IOObject> IOObjectSP;
+    typedef std::shared_ptr<lldb_private::JITLoader> JITLoaderSP;
+    typedef std::unique_ptr<lldb_private::JITLoaderList> JITLoaderListUP;
+    typedef std::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
+    typedef std::shared_ptr<lldb_private::SystemRuntime> SystemRuntimeSP;
+    typedef std::unique_ptr<lldb_private::SystemRuntime> SystemRuntimeUP;
+    typedef std::shared_ptr<lldb_private::LineTable> LineTableSP;
+    typedef std::shared_ptr<lldb_private::Listener> ListenerSP;
+    typedef std::shared_ptr<lldb_private::LogChannel> LogChannelSP;
+    typedef std::shared_ptr<lldb_private::MemoryHistory> MemoryHistorySP;
+    typedef std::shared_ptr<lldb_private::Module> ModuleSP;
+    typedef std::weak_ptr<lldb_private::Module> ModuleWP;
+    typedef std::shared_ptr<lldb_private::ObjectFile> ObjectFileSP;
+    typedef std::weak_ptr<lldb_private::ObjectFile> ObjectFileWP;
+    typedef std::shared_ptr<lldb_private::ObjectFileJITDelegate> ObjectFileJITDelegateSP;
+    typedef std::weak_ptr<lldb_private::ObjectFileJITDelegate> ObjectFileJITDelegateWP;
+    typedef std::unique_ptr<lldb_private::OperatingSystem> OperatingSystemUP;
+    typedef std::shared_ptr<lldb_private::OptionValue> OptionValueSP;
+    typedef std::weak_ptr<lldb_private::OptionValue> OptionValueWP;
+    typedef std::shared_ptr<lldb_private::OptionValueArch> OptionValueArchSP;
+    typedef std::shared_ptr<lldb_private::OptionValueArgs> OptionValueArgsSP;
+    typedef std::shared_ptr<lldb_private::OptionValueArray> OptionValueArraySP;
+    typedef std::shared_ptr<lldb_private::OptionValueBoolean> OptionValueBooleanSP;
+    typedef std::shared_ptr<lldb_private::OptionValueDictionary> OptionValueDictionarySP;
+    typedef std::shared_ptr<lldb_private::OptionValueFileSpec> OptionValueFileSpecSP;
+    typedef std::shared_ptr<lldb_private::OptionValueFileSpecList> OptionValueFileSpecListSP;
+    typedef std::shared_ptr<lldb_private::OptionValueFormat> OptionValueFormatSP;
+    typedef std::shared_ptr<lldb_private::OptionValuePathMappings> OptionValuePathMappingsSP;
+    typedef std::shared_ptr<lldb_private::OptionValueProperties> OptionValuePropertiesSP;
+    typedef std::shared_ptr<lldb_private::OptionValueRegex> OptionValueRegexSP;
+    typedef std::shared_ptr<lldb_private::OptionValueSInt64> OptionValueSInt64SP;
+    typedef std::shared_ptr<lldb_private::OptionValueString> OptionValueStringSP;
+    typedef std::shared_ptr<lldb_private::OptionValueUInt64> OptionValueUInt64SP;
+    typedef std::shared_ptr<lldb_private::OptionValueUUID> OptionValueUUIDSP;
+    typedef std::shared_ptr<lldb_private::Platform> PlatformSP;
+    typedef std::shared_ptr<lldb_private::Process> ProcessSP;
+    typedef std::shared_ptr<lldb_private::ProcessAttachInfo> ProcessAttachInfoSP;
+    typedef std::shared_ptr<lldb_private::ProcessLaunchInfo> ProcessLaunchInfoSP;
+    typedef std::weak_ptr<lldb_private::Process> ProcessWP;
+    typedef std::shared_ptr<lldb_private::Property> PropertySP;
+    typedef std::shared_ptr<lldb_private::RegisterCheckpoint> RegisterCheckpointSP;
+    typedef std::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
+    typedef std::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
+    typedef std::shared_ptr<lldb_private::Queue> QueueSP;
+    typedef std::weak_ptr<lldb_private::Queue> QueueWP;
+    typedef std::shared_ptr<lldb_private::QueueItem> QueueItemSP;
+#ifndef LLDB_DISABLE_PYTHON
+    typedef std::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptSummaryFormatSP;
+#endif // #ifndef LLDB_DISABLE_PYTHON
+    typedef std::shared_ptr<lldb_private::Section> SectionSP;
+    typedef std::unique_ptr<lldb_private::SectionList> SectionListUP;
+    typedef std::weak_ptr<lldb_private::Section> SectionWP;
+    typedef std::shared_ptr<lldb_private::SectionLoadList> SectionLoadListSP;
+    typedef std::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
+    typedef std::shared_ptr<lldb_private::Settings> SettingsSP;
+    typedef std::unique_ptr<lldb_private::SourceManager> SourceManagerUP;
+    typedef std::shared_ptr<lldb_private::StackFrame> StackFrameSP;
+    typedef std::unique_ptr<lldb_private::StackFrame> StackFrameUP;
+    typedef std::weak_ptr<lldb_private::StackFrame> StackFrameWP;
+    typedef std::shared_ptr<lldb_private::StackFrameList> StackFrameListSP;
+    typedef std::shared_ptr<lldb_private::StopInfo> StopInfoSP;
+    typedef std::shared_ptr<lldb_private::StoppointLocation> StoppointLocationSP;
+    typedef std::shared_ptr<lldb_private::Stream> StreamSP;
+    typedef std::weak_ptr<lldb_private::Stream> StreamWP;
+    typedef std::shared_ptr<lldb_private::StreamFile> StreamFileSP;
+    typedef std::shared_ptr<lldb_private::StringSummaryFormat> StringTypeSummaryImplSP;
+    typedef std::shared_ptr<lldb_private::SymbolFile> SymbolFileSP;
+    typedef std::shared_ptr<lldb_private::SymbolFileType> SymbolFileTypeSP;
+    typedef std::weak_ptr<lldb_private::SymbolFileType> SymbolFileTypeWP;
+    typedef std::shared_ptr<lldb_private::SymbolContextSpecifier> SymbolContextSpecifierSP;
+    typedef std::unique_ptr<lldb_private::SymbolVendor> SymbolVendorUP;
+    typedef std::shared_ptr<lldb_private::SyntheticChildren> SyntheticChildrenSP;
+    typedef std::shared_ptr<lldb_private::SyntheticChildrenFrontEnd> SyntheticChildrenFrontEndSP;
+    typedef std::shared_ptr<lldb_private::Target> TargetSP;
+    typedef std::weak_ptr<lldb_private::Target> TargetWP;
+    typedef std::shared_ptr<lldb_private::TargetProperties> TargetPropertiesSP;
+    typedef std::shared_ptr<lldb_private::Thread> ThreadSP;
+    typedef std::weak_ptr<lldb_private::Thread> ThreadWP;
+    typedef std::shared_ptr<lldb_private::ThreadCollection> ThreadCollectionSP;
+    typedef std::shared_ptr<lldb_private::ThreadPlan> ThreadPlanSP;
+    typedef std::shared_ptr<lldb_private::ThreadPlanTracer> ThreadPlanTracerSP;
+    typedef std::shared_ptr<lldb_private::Type> TypeSP;
+    typedef std::weak_ptr<lldb_private::Type> TypeWP;
+    typedef std::shared_ptr<lldb_private::TypeCategoryImpl> TypeCategoryImplSP;
+    typedef std::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
+    typedef std::shared_ptr<lldb_private::TypeMemberFunctionImpl> TypeMemberFunctionImplSP;
+    typedef std::shared_ptr<lldb_private::TypeEnumMemberImpl> TypeEnumMemberImplSP;
+    typedef std::shared_ptr<lldb_private::TypeFilterImpl> TypeFilterImplSP;
+    typedef std::shared_ptr<lldb_private::TypeFormatImpl> TypeFormatImplSP;
+    typedef std::shared_ptr<lldb_private::TypeNameSpecifierImpl> TypeNameSpecifierImplSP;
+    typedef std::shared_ptr<lldb_private::TypeSummaryImpl> TypeSummaryImplSP;
+    typedef std::shared_ptr<lldb_private::TypeSummaryOptions> TypeSummaryOptionsSP;
+    typedef std::shared_ptr<lldb_private::TypeValidatorImpl> TypeValidatorImplSP;
+#ifndef LLDB_DISABLE_PYTHON
+    typedef std::shared_ptr<lldb_private::ScriptedSyntheticChildren> ScriptedSyntheticChildrenSP;
+#endif
+    typedef std::shared_ptr<lldb_private::UnwindAssembly> UnwindAssemblySP;
+    typedef std::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
+    typedef lldb_private::SharingPtr<lldb_private::ValueObject> ValueObjectSP;
+    typedef std::shared_ptr<lldb_private::Value> ValueSP;
+    typedef std::shared_ptr<lldb_private::ValueList> ValueListSP;
+    typedef std::shared_ptr<lldb_private::Variable> VariableSP;
+    typedef std::shared_ptr<lldb_private::VariableList> VariableListSP;
+    typedef std::shared_ptr<lldb_private::ValueObjectList> ValueObjectListSP;
+    typedef std::shared_ptr<lldb_private::Watchpoint> WatchpointSP;
+
+} // namespace lldb
+
+
+#endif  // #if defined(__cplusplus)
+#endif  // LLDB_lldb_forward_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-types.h b/kcov-38/external/lldb/include/lldb/lldb-types.h
new file mode 100644
index 000000000000..fe902073698d
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/lldb-types.h
@@ -0,0 +1,118 @@
+//===-- lldb-types.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_lldb_types_h_
+#define LLDB_lldb_types_h_
+
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+
+#include <assert.h>
+#include <signal.h>
+#include <stdint.h>
+
+//----------------------------------------------------------------------
+// All host systems must define:
+//  lldb::condition_t       The native condition type (or a substitute class) for conditions on the host system.
+//  lldb::mutex_t           The native mutex type for mutex objects on the host system.
+//  lldb::thread_t          The native thread type for spawned threads on the system
+//  lldb::thread_arg_t      The type of the one any only thread creation argument for the host system
+//  lldb::thread_result_t   The return type that gets returned when a thread finishes.
+//  lldb::thread_func_t     The function prototype used to spawn a thread on the host system.
+//  #define LLDB_INVALID_PROCESS_ID ...
+//  #define LLDB_INVALID_THREAD_ID ...
+//  #define LLDB_INVALID_HOST_THREAD ...
+//  #define IS_VALID_LLDB_HOST_THREAD ...
+//----------------------------------------------------------------------
+
+// TODO: Add a bunch of ifdefs to determine the host system and what
+// things should be defined. Currently MacOSX is being assumed by default
+// since that is what lldb was first developed for.
+
+#ifndef _MSC_VER
+#include <stdbool.h>
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+
+#include <process.h>
+
+namespace lldb
+{
+    typedef void*               mutex_t;
+    typedef void*               condition_t;
+    typedef void*               rwlock_t;
+    typedef void*               process_t;                  // Process type is HANDLE
+    typedef void*               thread_t;                   // Host thread type
+    typedef void*               file_t;                     // Host file type
+    typedef void*               pipe_t;                     // Host pipe type
+    typedef unsigned int __w64  socket_t;                   // Host socket type
+    typedef uint32_t            thread_key_t;
+    typedef void*               thread_arg_t;               // Host thread argument type
+    typedef unsigned            thread_result_t;            // Host thread result type
+    typedef thread_result_t     (*thread_func_t)(void *);   // Host thread function type
+}
+
+#else
+
+#include <pthread.h>
+
+namespace lldb
+{
+    //----------------------------------------------------------------------
+    // MacOSX Types
+    //----------------------------------------------------------------------
+    typedef ::pthread_mutex_t   mutex_t;
+    typedef pthread_cond_t      condition_t;
+    typedef pthread_rwlock_t    rwlock_t;
+    typedef uint64_t            process_t;                  // Process type is just a pid.
+    typedef pthread_t           thread_t;                   // Host thread type
+    typedef int                 file_t;                     // Host file type
+    typedef int                 pipe_t;                     // Host pipe type
+    typedef int                 socket_t;                   // Host socket type
+    typedef pthread_key_t       thread_key_t;
+    typedef void *              thread_arg_t;               // Host thread argument type
+    typedef void *              thread_result_t;            // Host thread result type
+    typedef void *              (*thread_func_t)(void *);   // Host thread function type
+} // namespace lldb
+
+#endif
+
+namespace lldb
+{
+    typedef void                (*LogOutputCallback) (const char *, void *baton);
+    typedef bool                (*CommandOverrideCallback)(void *baton, const char **argv);
+    typedef bool                (*CommandOverrideCallbackWithResult)(void *baton,
+                                                                     const char **argv,
+                                                                     lldb_private::CommandReturnObject &result);
+    typedef bool                (*ExpressionCancelCallback) (ExpressionEvaluationPhase phase, void *baton);
+}
+
+#define LLDB_INVALID_PROCESS             ((lldb::process_t)-1)
+#define LLDB_INVALID_HOST_THREAD         ((lldb::thread_t)NULL)
+#define IS_VALID_LLDB_HOST_THREAD(t)     ((t) != LLDB_INVALID_HOST_THREAD)
+
+#define LLDB_INVALID_HOST_TIME           { 0, 0 }
+
+namespace lldb 
+{
+    typedef uint64_t    addr_t;
+    typedef uint64_t    user_id_t;
+    typedef uint64_t    pid_t;
+    typedef uint64_t    tid_t;
+    typedef uint64_t    offset_t;
+    typedef int32_t     break_id_t;
+    typedef int32_t     watch_id_t;
+    typedef void *      clang_type_t;
+    typedef uint64_t    queue_id_t;
+}
+
+
+#endif  // LLDB_lldb_types_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-versioning.h b/kcov-38/external/lldb/include/lldb/lldb-versioning.h
new file mode 100644
index 000000000000..d0498a569f58
--- /dev/null
+++ b/kcov-38/external/lldb/include/lldb/lldb-versioning.h
@@ -0,0 +1,1607 @@
+//===-- lldb-versioning.h ----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_lldb_versioning_h_
+#define LLDB_lldb_versioning_h_
+
+//----------------------------------------------------------------------
+// LLDB API version
+//----------------------------------------------------------------------
+#define LLDB_API_MAJOR_VERSION 1
+#define LLDB_API_MINOR_VERSION 0
+
+/*
+  API versioning
+ ---------------------------------
+ 
+ The LLDB API is versioned independently of the LLDB source base
+ Our API version numbers are composed of a major and a minor number
+
+ The major number means a complete and stable revision of the API. Major numbers are compatibility breakers
+ (i.e. when we change the API major number, there is no promise of compatibility with the previous major version
+  and we are free to remove and/or change any APIs)
+ Minor numbers are a work-in-progress evolution of the API. APIs will not be removed or changed across minor versions
+ (minors do not break compatibility). However, we can deprecate APIs in minor versions or add new APIs in minor versions
+ A deprecated API is supposedly going to be removed in the next major version and will generate a warning if used
+ APIs we add in minor versions will not be removed (at least until the following major) but they might theoretically be deprecated
+ in a following minor version
+ Users are discouraged from using the LLDB version number to test for API features and should instead use the API version checking
+ as discussed below
+ 
+  API version checking
+ ---------------------------------
+ 
+ You can (optionally) sign into an API version checking feature
+ To do so you need to define three macros:
+ LLDB_API_CHECK_VERSIONING - define to any value (or no value)
+ LLDB_API_MAJOR_VERSION_WANTED - which major version of the LLDB API you are targeting
+ LLDB_API_MINOR_VERSION_WANTED - which minor version of the LLDB API you are targeting
+ 
+ If these macros exist - LLDB will enable version checking of the public API
+ 
+ If LLDB_API_MAJOR_VERSION is not equal to LLDB_API_MAJOR_VERSION_WANTED we will immediately halt your compilation with an error
+ This is by design, since we do not make any promise of compatibility across major versions - if you really want to test your luck, disable the versioning altogether
+ 
+ If the major version test passes, you have signed up for a specific minor version of the API
+ Whenever we add or deprecate an API in a minor version, we will mark it with either
+ LLDB_API_NEW_IN_DOT_x - this API is new in LLDB .x
+ LLDB_API_DEPRECATED_IN_DOT_x - this API is deprecated as of .x
+ 
+ If you are using an API new in DOT_x
+  if LLDB_API_MINOR_VERSION_WANTED >= x then all is well, else you will get a compilation error
+   This is meant to prevent you from using APIs that are newer than whatever LLDB you want to target
+
+ If you are using an API deprecated in DOT_x
+  if LLDB_API_MINOR_VERSION_WANTED >= x then you will get a compilation warning, else all is well
+  This is meant to let you know that you are using an API that is deprecated and might go away
+ 
+  Caveats
+ ---------------------------------
+ 
+ Version checking only works on clang on OSX - you will get an error if you try to enable it on any other OS/compiler
+ If you want to enable version checking on other platforms, you will need to define appropriate implementations for
+ LLDB_API_IMPL_DEPRECATED and LLDB_API_IMPL_TOONEW and any other infrastructure your compiler needs for this purpose
+ 
+ We have no deprecation-as-error mode
+ 
+ There is no support for API versioning in Python
+ 
+ We reserve to use macros whose names begin with LLDB_API_ and you should not use them in your source code as they might conflict
+ with present or future macro names we are using to implement versioning
+*/
+
+// if you want the version checking to work on other OS/compiler, define appropriate IMPL_DEPRECATED/IMPL_TOONEW
+// and define LLDB_API_CHECK_VERSIONING_WORKS when you are ready to go live
+#if defined(__APPLE__) && defined(__clang__)
+#define LLDB_API_IMPL_DEPRECATED __attribute__((deprecated))
+#define LLDB_API_IMPL_TOONEW __attribute__((unavailable))
+#define LLDB_API_CHECK_VERSIONING_WORKS
+#endif
+
+#if defined(LLDB_API_CHECK_VERSIONING) && !defined(LLDB_API_CHECK_VERSIONING_WORKS)
+#error "API version checking will not work here - please disable or create and submit patches to lldb-versioning.h"
+#endif
+
+#if defined(LLDB_API_CHECK_VERSIONING_WORKS) && (!defined(LLDB_API_IMPL_DEPRECATED) || !defined(LLDB_API_IMPL_TOONEW))
+#error "LLDB_API_CHECK_VERSIONING_WORKS needs LLDB_API_IMPL_DEPRECATED and LLDB_API_IMPL_TOONEW to be defined"
+#endif
+
+#if defined(LLDB_API_CHECK_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED)
+
+#if defined (LLDB_API_MAJOR_VERSION) && (LLDB_API_MAJOR_VERSION != LLDB_API_MAJOR_VERSION_WANTED)
+#error "Cannot link using this LLDB version - public API versions are incompatible"
+#endif
+
+#define LLDB_API_MINOR_VERSION_DOT_0 0
+#define LLDB_API_MINOR_VERSION_DOT_1 1
+#define LLDB_API_MINOR_VERSION_DOT_2 2
+#define LLDB_API_MINOR_VERSION_DOT_3 3
+#define LLDB_API_MINOR_VERSION_DOT_4 4
+#define LLDB_API_MINOR_VERSION_DOT_5 5
+#define LLDB_API_MINOR_VERSION_DOT_6 6
+#define LLDB_API_MINOR_VERSION_DOT_7 7
+#define LLDB_API_MINOR_VERSION_DOT_8 8
+#define LLDB_API_MINOR_VERSION_DOT_9 9
+#define LLDB_API_MINOR_VERSION_DOT_10 10
+#define LLDB_API_MINOR_VERSION_DOT_11 11
+#define LLDB_API_MINOR_VERSION_DOT_12 12
+#define LLDB_API_MINOR_VERSION_DOT_13 13
+#define LLDB_API_MINOR_VERSION_DOT_14 14
+#define LLDB_API_MINOR_VERSION_DOT_15 15
+#define LLDB_API_MINOR_VERSION_DOT_16 16
+#define LLDB_API_MINOR_VERSION_DOT_17 17
+#define LLDB_API_MINOR_VERSION_DOT_18 18
+#define LLDB_API_MINOR_VERSION_DOT_19 19
+#define LLDB_API_MINOR_VERSION_DOT_20 20
+#define LLDB_API_MINOR_VERSION_DOT_21 21
+#define LLDB_API_MINOR_VERSION_DOT_22 22
+#define LLDB_API_MINOR_VERSION_DOT_23 23
+#define LLDB_API_MINOR_VERSION_DOT_24 24
+#define LLDB_API_MINOR_VERSION_DOT_25 25
+#define LLDB_API_MINOR_VERSION_DOT_26 26
+#define LLDB_API_MINOR_VERSION_DOT_27 27
+#define LLDB_API_MINOR_VERSION_DOT_28 28
+#define LLDB_API_MINOR_VERSION_DOT_29 29
+#define LLDB_API_MINOR_VERSION_DOT_30 30
+#define LLDB_API_MINOR_VERSION_DOT_31 31
+#define LLDB_API_MINOR_VERSION_DOT_32 32
+#define LLDB_API_MINOR_VERSION_DOT_33 33
+#define LLDB_API_MINOR_VERSION_DOT_34 34
+#define LLDB_API_MINOR_VERSION_DOT_35 35
+#define LLDB_API_MINOR_VERSION_DOT_36 36
+#define LLDB_API_MINOR_VERSION_DOT_37 37
+#define LLDB_API_MINOR_VERSION_DOT_38 38
+#define LLDB_API_MINOR_VERSION_DOT_39 39
+#define LLDB_API_MINOR_VERSION_DOT_40 40
+#define LLDB_API_MINOR_VERSION_DOT_41 41
+#define LLDB_API_MINOR_VERSION_DOT_42 42
+#define LLDB_API_MINOR_VERSION_DOT_43 43
+#define LLDB_API_MINOR_VERSION_DOT_44 44
+#define LLDB_API_MINOR_VERSION_DOT_45 45
+#define LLDB_API_MINOR_VERSION_DOT_46 46
+#define LLDB_API_MINOR_VERSION_DOT_47 47
+#define LLDB_API_MINOR_VERSION_DOT_48 48
+#define LLDB_API_MINOR_VERSION_DOT_49 49
+#define LLDB_API_MINOR_VERSION_DOT_50 50
+#define LLDB_API_MINOR_VERSION_DOT_51 51
+#define LLDB_API_MINOR_VERSION_DOT_52 52
+#define LLDB_API_MINOR_VERSION_DOT_53 53
+#define LLDB_API_MINOR_VERSION_DOT_54 54
+#define LLDB_API_MINOR_VERSION_DOT_55 55
+#define LLDB_API_MINOR_VERSION_DOT_56 56
+#define LLDB_API_MINOR_VERSION_DOT_57 57
+#define LLDB_API_MINOR_VERSION_DOT_58 58
+#define LLDB_API_MINOR_VERSION_DOT_59 59
+#define LLDB_API_MINOR_VERSION_DOT_60 60
+#define LLDB_API_MINOR_VERSION_DOT_61 61
+#define LLDB_API_MINOR_VERSION_DOT_62 62
+#define LLDB_API_MINOR_VERSION_DOT_63 63
+#define LLDB_API_MINOR_VERSION_DOT_64 64
+#define LLDB_API_MINOR_VERSION_DOT_65 65
+#define LLDB_API_MINOR_VERSION_DOT_66 66
+#define LLDB_API_MINOR_VERSION_DOT_67 67
+#define LLDB_API_MINOR_VERSION_DOT_68 68
+#define LLDB_API_MINOR_VERSION_DOT_69 69
+#define LLDB_API_MINOR_VERSION_DOT_70 70
+#define LLDB_API_MINOR_VERSION_DOT_71 71
+#define LLDB_API_MINOR_VERSION_DOT_72 72
+#define LLDB_API_MINOR_VERSION_DOT_73 73
+#define LLDB_API_MINOR_VERSION_DOT_74 74
+#define LLDB_API_MINOR_VERSION_DOT_75 75
+#define LLDB_API_MINOR_VERSION_DOT_76 76
+#define LLDB_API_MINOR_VERSION_DOT_77 77
+#define LLDB_API_MINOR_VERSION_DOT_78 78
+#define LLDB_API_MINOR_VERSION_DOT_79 79
+#define LLDB_API_MINOR_VERSION_DOT_80 80
+#define LLDB_API_MINOR_VERSION_DOT_81 81
+#define LLDB_API_MINOR_VERSION_DOT_82 82
+#define LLDB_API_MINOR_VERSION_DOT_83 83
+#define LLDB_API_MINOR_VERSION_DOT_84 84
+#define LLDB_API_MINOR_VERSION_DOT_85 85
+#define LLDB_API_MINOR_VERSION_DOT_86 86
+#define LLDB_API_MINOR_VERSION_DOT_87 87
+#define LLDB_API_MINOR_VERSION_DOT_88 88
+#define LLDB_API_MINOR_VERSION_DOT_89 89
+#define LLDB_API_MINOR_VERSION_DOT_90 90
+#define LLDB_API_MINOR_VERSION_DOT_91 91
+#define LLDB_API_MINOR_VERSION_DOT_92 92
+#define LLDB_API_MINOR_VERSION_DOT_93 93
+#define LLDB_API_MINOR_VERSION_DOT_94 94
+#define LLDB_API_MINOR_VERSION_DOT_95 95
+#define LLDB_API_MINOR_VERSION_DOT_96 96
+#define LLDB_API_MINOR_VERSION_DOT_97 97
+#define LLDB_API_MINOR_VERSION_DOT_98 98
+#define LLDB_API_MINOR_VERSION_DOT_99 99
+
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_0
+#define LLDB_API_NEW_IN_DOT_0 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_0
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_0
+#define LLDB_API_DEPRECATED_IN_DOT_0 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_0
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_1
+#define LLDB_API_NEW_IN_DOT_1 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_1
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_1
+#define LLDB_API_DEPRECATED_IN_DOT_1 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_1
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_2
+#define LLDB_API_NEW_IN_DOT_2 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_2
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_2
+#define LLDB_API_DEPRECATED_IN_DOT_2 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_2
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_3
+#define LLDB_API_NEW_IN_DOT_3 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_3
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_3
+#define LLDB_API_DEPRECATED_IN_DOT_3 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_3
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_4
+#define LLDB_API_NEW_IN_DOT_4 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_4
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_4
+#define LLDB_API_DEPRECATED_IN_DOT_4 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_4
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_5
+#define LLDB_API_NEW_IN_DOT_5 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_5
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_5
+#define LLDB_API_DEPRECATED_IN_DOT_5 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_5
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_6
+#define LLDB_API_NEW_IN_DOT_6 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_6
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_6
+#define LLDB_API_DEPRECATED_IN_DOT_6 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_6
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_7
+#define LLDB_API_NEW_IN_DOT_7 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_7
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_7
+#define LLDB_API_DEPRECATED_IN_DOT_7 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_7
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_8
+#define LLDB_API_NEW_IN_DOT_8 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_8
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_8
+#define LLDB_API_DEPRECATED_IN_DOT_8 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_8
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_9
+#define LLDB_API_NEW_IN_DOT_9 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_9
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_9
+#define LLDB_API_DEPRECATED_IN_DOT_9 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_9
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_10
+#define LLDB_API_NEW_IN_DOT_10 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_10
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_10
+#define LLDB_API_DEPRECATED_IN_DOT_10 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_10
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_11
+#define LLDB_API_NEW_IN_DOT_11 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_11
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_11
+#define LLDB_API_DEPRECATED_IN_DOT_11 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_11
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_12
+#define LLDB_API_NEW_IN_DOT_12 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_12
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_12
+#define LLDB_API_DEPRECATED_IN_DOT_12 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_12
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_13
+#define LLDB_API_NEW_IN_DOT_13 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_13
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_13
+#define LLDB_API_DEPRECATED_IN_DOT_13 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_13
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_14
+#define LLDB_API_NEW_IN_DOT_14 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_14
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_14
+#define LLDB_API_DEPRECATED_IN_DOT_14 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_14
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_15
+#define LLDB_API_NEW_IN_DOT_15 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_15
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_15
+#define LLDB_API_DEPRECATED_IN_DOT_15 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_15
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_16
+#define LLDB_API_NEW_IN_DOT_16 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_16
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_16
+#define LLDB_API_DEPRECATED_IN_DOT_16 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_16
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_17
+#define LLDB_API_NEW_IN_DOT_17 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_17
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_17
+#define LLDB_API_DEPRECATED_IN_DOT_17 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_17
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_18
+#define LLDB_API_NEW_IN_DOT_18 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_18
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_18
+#define LLDB_API_DEPRECATED_IN_DOT_18 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_18
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_19
+#define LLDB_API_NEW_IN_DOT_19 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_19
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_19
+#define LLDB_API_DEPRECATED_IN_DOT_19 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_19
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_20
+#define LLDB_API_NEW_IN_DOT_20 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_20
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_20
+#define LLDB_API_DEPRECATED_IN_DOT_20 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_20
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_21
+#define LLDB_API_NEW_IN_DOT_21 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_21
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_21
+#define LLDB_API_DEPRECATED_IN_DOT_21 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_21
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_22
+#define LLDB_API_NEW_IN_DOT_22 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_22
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_22
+#define LLDB_API_DEPRECATED_IN_DOT_22 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_22
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_23
+#define LLDB_API_NEW_IN_DOT_23 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_23
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_23
+#define LLDB_API_DEPRECATED_IN_DOT_23 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_23
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_24
+#define LLDB_API_NEW_IN_DOT_24 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_24
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_24
+#define LLDB_API_DEPRECATED_IN_DOT_24 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_24
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_25
+#define LLDB_API_NEW_IN_DOT_25 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_25
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_25
+#define LLDB_API_DEPRECATED_IN_DOT_25 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_25
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_26
+#define LLDB_API_NEW_IN_DOT_26 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_26
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_26
+#define LLDB_API_DEPRECATED_IN_DOT_26 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_26
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_27
+#define LLDB_API_NEW_IN_DOT_27 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_27
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_27
+#define LLDB_API_DEPRECATED_IN_DOT_27 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_27
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_28
+#define LLDB_API_NEW_IN_DOT_28 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_28
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_28
+#define LLDB_API_DEPRECATED_IN_DOT_28 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_28
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_29
+#define LLDB_API_NEW_IN_DOT_29 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_29
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_29
+#define LLDB_API_DEPRECATED_IN_DOT_29 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_29
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_30
+#define LLDB_API_NEW_IN_DOT_30 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_30
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_30
+#define LLDB_API_DEPRECATED_IN_DOT_30 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_30
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_31
+#define LLDB_API_NEW_IN_DOT_31 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_31
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_31
+#define LLDB_API_DEPRECATED_IN_DOT_31 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_31
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_32
+#define LLDB_API_NEW_IN_DOT_32 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_32
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_32
+#define LLDB_API_DEPRECATED_IN_DOT_32 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_32
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_33
+#define LLDB_API_NEW_IN_DOT_33 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_33
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_33
+#define LLDB_API_DEPRECATED_IN_DOT_33 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_33
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_34
+#define LLDB_API_NEW_IN_DOT_34 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_34
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_34
+#define LLDB_API_DEPRECATED_IN_DOT_34 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_34
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_35
+#define LLDB_API_NEW_IN_DOT_35 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_35
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_35
+#define LLDB_API_DEPRECATED_IN_DOT_35 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_35
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_36
+#define LLDB_API_NEW_IN_DOT_36 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_36
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_36
+#define LLDB_API_DEPRECATED_IN_DOT_36 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_36
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_37
+#define LLDB_API_NEW_IN_DOT_37 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_37
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_37
+#define LLDB_API_DEPRECATED_IN_DOT_37 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_37
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_38
+#define LLDB_API_NEW_IN_DOT_38 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_38
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_38
+#define LLDB_API_DEPRECATED_IN_DOT_38 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_38
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_39
+#define LLDB_API_NEW_IN_DOT_39 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_39
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_39
+#define LLDB_API_DEPRECATED_IN_DOT_39 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_39
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_40
+#define LLDB_API_NEW_IN_DOT_40 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_40
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_40
+#define LLDB_API_DEPRECATED_IN_DOT_40 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_40
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_41
+#define LLDB_API_NEW_IN_DOT_41 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_41
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_41
+#define LLDB_API_DEPRECATED_IN_DOT_41 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_41
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_42
+#define LLDB_API_NEW_IN_DOT_42 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_42
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_42
+#define LLDB_API_DEPRECATED_IN_DOT_42 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_42
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_43
+#define LLDB_API_NEW_IN_DOT_43 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_43
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_43
+#define LLDB_API_DEPRECATED_IN_DOT_43 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_43
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_44
+#define LLDB_API_NEW_IN_DOT_44 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_44
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_44
+#define LLDB_API_DEPRECATED_IN_DOT_44 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_44
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_45
+#define LLDB_API_NEW_IN_DOT_45 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_45
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_45
+#define LLDB_API_DEPRECATED_IN_DOT_45 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_45
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_46
+#define LLDB_API_NEW_IN_DOT_46 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_46
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_46
+#define LLDB_API_DEPRECATED_IN_DOT_46 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_46
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_47
+#define LLDB_API_NEW_IN_DOT_47 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_47
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_47
+#define LLDB_API_DEPRECATED_IN_DOT_47 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_47
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_48
+#define LLDB_API_NEW_IN_DOT_48 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_48
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_48
+#define LLDB_API_DEPRECATED_IN_DOT_48 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_48
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_49
+#define LLDB_API_NEW_IN_DOT_49 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_49
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_49
+#define LLDB_API_DEPRECATED_IN_DOT_49 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_49
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_50
+#define LLDB_API_NEW_IN_DOT_50 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_50
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_50
+#define LLDB_API_DEPRECATED_IN_DOT_50 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_50
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_51
+#define LLDB_API_NEW_IN_DOT_51 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_51
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_51
+#define LLDB_API_DEPRECATED_IN_DOT_51 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_51
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_52
+#define LLDB_API_NEW_IN_DOT_52 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_52
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_52
+#define LLDB_API_DEPRECATED_IN_DOT_52 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_52
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_53
+#define LLDB_API_NEW_IN_DOT_53 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_53
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_53
+#define LLDB_API_DEPRECATED_IN_DOT_53 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_53
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_54
+#define LLDB_API_NEW_IN_DOT_54 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_54
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_54
+#define LLDB_API_DEPRECATED_IN_DOT_54 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_54
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_55
+#define LLDB_API_NEW_IN_DOT_55 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_55
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_55
+#define LLDB_API_DEPRECATED_IN_DOT_55 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_55
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_56
+#define LLDB_API_NEW_IN_DOT_56 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_56
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_56
+#define LLDB_API_DEPRECATED_IN_DOT_56 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_56
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_57
+#define LLDB_API_NEW_IN_DOT_57 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_57
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_57
+#define LLDB_API_DEPRECATED_IN_DOT_57 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_57
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_58
+#define LLDB_API_NEW_IN_DOT_58 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_58
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_58
+#define LLDB_API_DEPRECATED_IN_DOT_58 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_58
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_59
+#define LLDB_API_NEW_IN_DOT_59 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_59
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_59
+#define LLDB_API_DEPRECATED_IN_DOT_59 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_59
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_60
+#define LLDB_API_NEW_IN_DOT_60 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_60
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_60
+#define LLDB_API_DEPRECATED_IN_DOT_60 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_60
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_61
+#define LLDB_API_NEW_IN_DOT_61 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_61
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_61
+#define LLDB_API_DEPRECATED_IN_DOT_61 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_61
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_62
+#define LLDB_API_NEW_IN_DOT_62 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_62
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_62
+#define LLDB_API_DEPRECATED_IN_DOT_62 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_62
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_63
+#define LLDB_API_NEW_IN_DOT_63 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_63
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_63
+#define LLDB_API_DEPRECATED_IN_DOT_63 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_63
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_64
+#define LLDB_API_NEW_IN_DOT_64 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_64
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_64
+#define LLDB_API_DEPRECATED_IN_DOT_64 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_64
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_65
+#define LLDB_API_NEW_IN_DOT_65 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_65
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_65
+#define LLDB_API_DEPRECATED_IN_DOT_65 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_65
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_66
+#define LLDB_API_NEW_IN_DOT_66 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_66
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_66
+#define LLDB_API_DEPRECATED_IN_DOT_66 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_66
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_67
+#define LLDB_API_NEW_IN_DOT_67 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_67
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_67
+#define LLDB_API_DEPRECATED_IN_DOT_67 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_67
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_68
+#define LLDB_API_NEW_IN_DOT_68 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_68
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_68
+#define LLDB_API_DEPRECATED_IN_DOT_68 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_68
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_69
+#define LLDB_API_NEW_IN_DOT_69 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_69
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_69
+#define LLDB_API_DEPRECATED_IN_DOT_69 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_69
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_70
+#define LLDB_API_NEW_IN_DOT_70 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_70
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_70
+#define LLDB_API_DEPRECATED_IN_DOT_70 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_70
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_71
+#define LLDB_API_NEW_IN_DOT_71 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_71
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_71
+#define LLDB_API_DEPRECATED_IN_DOT_71 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_71
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_72
+#define LLDB_API_NEW_IN_DOT_72 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_72
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_72
+#define LLDB_API_DEPRECATED_IN_DOT_72 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_72
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_73
+#define LLDB_API_NEW_IN_DOT_73 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_73
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_73
+#define LLDB_API_DEPRECATED_IN_DOT_73 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_73
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_74
+#define LLDB_API_NEW_IN_DOT_74 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_74
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_74
+#define LLDB_API_DEPRECATED_IN_DOT_74 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_74
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_75
+#define LLDB_API_NEW_IN_DOT_75 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_75
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_75
+#define LLDB_API_DEPRECATED_IN_DOT_75 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_75
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_76
+#define LLDB_API_NEW_IN_DOT_76 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_76
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_76
+#define LLDB_API_DEPRECATED_IN_DOT_76 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_76
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_77
+#define LLDB_API_NEW_IN_DOT_77 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_77
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_77
+#define LLDB_API_DEPRECATED_IN_DOT_77 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_77
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_78
+#define LLDB_API_NEW_IN_DOT_78 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_78
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_78
+#define LLDB_API_DEPRECATED_IN_DOT_78 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_78
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_79
+#define LLDB_API_NEW_IN_DOT_79 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_79
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_79
+#define LLDB_API_DEPRECATED_IN_DOT_79 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_79
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_80
+#define LLDB_API_NEW_IN_DOT_80 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_80
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_80
+#define LLDB_API_DEPRECATED_IN_DOT_80 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_80
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_81
+#define LLDB_API_NEW_IN_DOT_81 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_81
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_81
+#define LLDB_API_DEPRECATED_IN_DOT_81 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_81
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_82
+#define LLDB_API_NEW_IN_DOT_82 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_82
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_82
+#define LLDB_API_DEPRECATED_IN_DOT_82 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_82
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_83
+#define LLDB_API_NEW_IN_DOT_83 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_83
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_83
+#define LLDB_API_DEPRECATED_IN_DOT_83 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_83
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_84
+#define LLDB_API_NEW_IN_DOT_84 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_84
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_84
+#define LLDB_API_DEPRECATED_IN_DOT_84 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_84
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_85
+#define LLDB_API_NEW_IN_DOT_85 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_85
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_85
+#define LLDB_API_DEPRECATED_IN_DOT_85 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_85
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_86
+#define LLDB_API_NEW_IN_DOT_86 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_86
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_86
+#define LLDB_API_DEPRECATED_IN_DOT_86 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_86
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_87
+#define LLDB_API_NEW_IN_DOT_87 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_87
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_87
+#define LLDB_API_DEPRECATED_IN_DOT_87 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_87
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_88
+#define LLDB_API_NEW_IN_DOT_88 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_88
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_88
+#define LLDB_API_DEPRECATED_IN_DOT_88 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_88
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_89
+#define LLDB_API_NEW_IN_DOT_89 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_89
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_89
+#define LLDB_API_DEPRECATED_IN_DOT_89 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_89
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_90
+#define LLDB_API_NEW_IN_DOT_90 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_90
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_90
+#define LLDB_API_DEPRECATED_IN_DOT_90 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_90
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_91
+#define LLDB_API_NEW_IN_DOT_91 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_91
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_91
+#define LLDB_API_DEPRECATED_IN_DOT_91 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_91
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_92
+#define LLDB_API_NEW_IN_DOT_92 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_92
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_92
+#define LLDB_API_DEPRECATED_IN_DOT_92 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_92
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_93
+#define LLDB_API_NEW_IN_DOT_93 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_93
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_93
+#define LLDB_API_DEPRECATED_IN_DOT_93 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_93
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_94
+#define LLDB_API_NEW_IN_DOT_94 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_94
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_94
+#define LLDB_API_DEPRECATED_IN_DOT_94 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_94
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_95
+#define LLDB_API_NEW_IN_DOT_95 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_95
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_95
+#define LLDB_API_DEPRECATED_IN_DOT_95 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_95
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_96
+#define LLDB_API_NEW_IN_DOT_96 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_96
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_96
+#define LLDB_API_DEPRECATED_IN_DOT_96 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_96
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_97
+#define LLDB_API_NEW_IN_DOT_97 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_97
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_97
+#define LLDB_API_DEPRECATED_IN_DOT_97 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_97
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_98
+#define LLDB_API_NEW_IN_DOT_98 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_98
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_98
+#define LLDB_API_DEPRECATED_IN_DOT_98 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_98
+#endif
+#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_99
+#define LLDB_API_NEW_IN_DOT_99 LLDB_API_IMPL_TOONEW
+#else
+#define LLDB_API_NEW_IN_DOT_99
+#endif
+
+
+#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_99
+#define LLDB_API_DEPRECATED_IN_DOT_99 LLDB_API_IMPL_DEPRECATED
+#else
+#define LLDB_API_DEPRECATED_IN_DOT_99
+#endif
+
+#else // defined(LLDB_CHECK_API_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED) && defined (LLDB_API_MAJOR_VERSION)
+
+#define LLDB_API_NEW_IN_DOT_0
+#define LLDB_API_DEPRECATED_IN_DOT_0
+#define LLDB_API_NEW_IN_DOT_1
+#define LLDB_API_DEPRECATED_IN_DOT_1
+#define LLDB_API_NEW_IN_DOT_2
+#define LLDB_API_DEPRECATED_IN_DOT_2
+#define LLDB_API_NEW_IN_DOT_3
+#define LLDB_API_DEPRECATED_IN_DOT_3
+#define LLDB_API_NEW_IN_DOT_4
+#define LLDB_API_DEPRECATED_IN_DOT_4
+#define LLDB_API_NEW_IN_DOT_5
+#define LLDB_API_DEPRECATED_IN_DOT_5
+#define LLDB_API_NEW_IN_DOT_6
+#define LLDB_API_DEPRECATED_IN_DOT_6
+#define LLDB_API_NEW_IN_DOT_7
+#define LLDB_API_DEPRECATED_IN_DOT_7
+#define LLDB_API_NEW_IN_DOT_8
+#define LLDB_API_DEPRECATED_IN_DOT_8
+#define LLDB_API_NEW_IN_DOT_9
+#define LLDB_API_DEPRECATED_IN_DOT_9
+#define LLDB_API_NEW_IN_DOT_10
+#define LLDB_API_DEPRECATED_IN_DOT_10
+#define LLDB_API_NEW_IN_DOT_11
+#define LLDB_API_DEPRECATED_IN_DOT_11
+#define LLDB_API_NEW_IN_DOT_12
+#define LLDB_API_DEPRECATED_IN_DOT_12
+#define LLDB_API_NEW_IN_DOT_13
+#define LLDB_API_DEPRECATED_IN_DOT_13
+#define LLDB_API_NEW_IN_DOT_14
+#define LLDB_API_DEPRECATED_IN_DOT_14
+#define LLDB_API_NEW_IN_DOT_15
+#define LLDB_API_DEPRECATED_IN_DOT_15
+#define LLDB_API_NEW_IN_DOT_16
+#define LLDB_API_DEPRECATED_IN_DOT_16
+#define LLDB_API_NEW_IN_DOT_17
+#define LLDB_API_DEPRECATED_IN_DOT_17
+#define LLDB_API_NEW_IN_DOT_18
+#define LLDB_API_DEPRECATED_IN_DOT_18
+#define LLDB_API_NEW_IN_DOT_19
+#define LLDB_API_DEPRECATED_IN_DOT_19
+#define LLDB_API_NEW_IN_DOT_20
+#define LLDB_API_DEPRECATED_IN_DOT_20
+#define LLDB_API_NEW_IN_DOT_21
+#define LLDB_API_DEPRECATED_IN_DOT_21
+#define LLDB_API_NEW_IN_DOT_22
+#define LLDB_API_DEPRECATED_IN_DOT_22
+#define LLDB_API_NEW_IN_DOT_23
+#define LLDB_API_DEPRECATED_IN_DOT_23
+#define LLDB_API_NEW_IN_DOT_24
+#define LLDB_API_DEPRECATED_IN_DOT_24
+#define LLDB_API_NEW_IN_DOT_25
+#define LLDB_API_DEPRECATED_IN_DOT_25
+#define LLDB_API_NEW_IN_DOT_26
+#define LLDB_API_DEPRECATED_IN_DOT_26
+#define LLDB_API_NEW_IN_DOT_27
+#define LLDB_API_DEPRECATED_IN_DOT_27
+#define LLDB_API_NEW_IN_DOT_28
+#define LLDB_API_DEPRECATED_IN_DOT_28
+#define LLDB_API_NEW_IN_DOT_29
+#define LLDB_API_DEPRECATED_IN_DOT_29
+#define LLDB_API_NEW_IN_DOT_30
+#define LLDB_API_DEPRECATED_IN_DOT_30
+#define LLDB_API_NEW_IN_DOT_31
+#define LLDB_API_DEPRECATED_IN_DOT_31
+#define LLDB_API_NEW_IN_DOT_32
+#define LLDB_API_DEPRECATED_IN_DOT_32
+#define LLDB_API_NEW_IN_DOT_33
+#define LLDB_API_DEPRECATED_IN_DOT_33
+#define LLDB_API_NEW_IN_DOT_34
+#define LLDB_API_DEPRECATED_IN_DOT_34
+#define LLDB_API_NEW_IN_DOT_35
+#define LLDB_API_DEPRECATED_IN_DOT_35
+#define LLDB_API_NEW_IN_DOT_36
+#define LLDB_API_DEPRECATED_IN_DOT_36
+#define LLDB_API_NEW_IN_DOT_37
+#define LLDB_API_DEPRECATED_IN_DOT_37
+#define LLDB_API_NEW_IN_DOT_38
+#define LLDB_API_DEPRECATED_IN_DOT_38
+#define LLDB_API_NEW_IN_DOT_39
+#define LLDB_API_DEPRECATED_IN_DOT_39
+#define LLDB_API_NEW_IN_DOT_40
+#define LLDB_API_DEPRECATED_IN_DOT_40
+#define LLDB_API_NEW_IN_DOT_41
+#define LLDB_API_DEPRECATED_IN_DOT_41
+#define LLDB_API_NEW_IN_DOT_42
+#define LLDB_API_DEPRECATED_IN_DOT_42
+#define LLDB_API_NEW_IN_DOT_43
+#define LLDB_API_DEPRECATED_IN_DOT_43
+#define LLDB_API_NEW_IN_DOT_44
+#define LLDB_API_DEPRECATED_IN_DOT_44
+#define LLDB_API_NEW_IN_DOT_45
+#define LLDB_API_DEPRECATED_IN_DOT_45
+#define LLDB_API_NEW_IN_DOT_46
+#define LLDB_API_DEPRECATED_IN_DOT_46
+#define LLDB_API_NEW_IN_DOT_47
+#define LLDB_API_DEPRECATED_IN_DOT_47
+#define LLDB_API_NEW_IN_DOT_48
+#define LLDB_API_DEPRECATED_IN_DOT_48
+#define LLDB_API_NEW_IN_DOT_49
+#define LLDB_API_DEPRECATED_IN_DOT_49
+#define LLDB_API_NEW_IN_DOT_50
+#define LLDB_API_DEPRECATED_IN_DOT_50
+#define LLDB_API_NEW_IN_DOT_51
+#define LLDB_API_DEPRECATED_IN_DOT_51
+#define LLDB_API_NEW_IN_DOT_52
+#define LLDB_API_DEPRECATED_IN_DOT_52
+#define LLDB_API_NEW_IN_DOT_53
+#define LLDB_API_DEPRECATED_IN_DOT_53
+#define LLDB_API_NEW_IN_DOT_54
+#define LLDB_API_DEPRECATED_IN_DOT_54
+#define LLDB_API_NEW_IN_DOT_55
+#define LLDB_API_DEPRECATED_IN_DOT_55
+#define LLDB_API_NEW_IN_DOT_56
+#define LLDB_API_DEPRECATED_IN_DOT_56
+#define LLDB_API_NEW_IN_DOT_57
+#define LLDB_API_DEPRECATED_IN_DOT_57
+#define LLDB_API_NEW_IN_DOT_58
+#define LLDB_API_DEPRECATED_IN_DOT_58
+#define LLDB_API_NEW_IN_DOT_59
+#define LLDB_API_DEPRECATED_IN_DOT_59
+#define LLDB_API_NEW_IN_DOT_60
+#define LLDB_API_DEPRECATED_IN_DOT_60
+#define LLDB_API_NEW_IN_DOT_61
+#define LLDB_API_DEPRECATED_IN_DOT_61
+#define LLDB_API_NEW_IN_DOT_62
+#define LLDB_API_DEPRECATED_IN_DOT_62
+#define LLDB_API_NEW_IN_DOT_63
+#define LLDB_API_DEPRECATED_IN_DOT_63
+#define LLDB_API_NEW_IN_DOT_64
+#define LLDB_API_DEPRECATED_IN_DOT_64
+#define LLDB_API_NEW_IN_DOT_65
+#define LLDB_API_DEPRECATED_IN_DOT_65
+#define LLDB_API_NEW_IN_DOT_66
+#define LLDB_API_DEPRECATED_IN_DOT_66
+#define LLDB_API_NEW_IN_DOT_67
+#define LLDB_API_DEPRECATED_IN_DOT_67
+#define LLDB_API_NEW_IN_DOT_68
+#define LLDB_API_DEPRECATED_IN_DOT_68
+#define LLDB_API_NEW_IN_DOT_69
+#define LLDB_API_DEPRECATED_IN_DOT_69
+#define LLDB_API_NEW_IN_DOT_70
+#define LLDB_API_DEPRECATED_IN_DOT_70
+#define LLDB_API_NEW_IN_DOT_71
+#define LLDB_API_DEPRECATED_IN_DOT_71
+#define LLDB_API_NEW_IN_DOT_72
+#define LLDB_API_DEPRECATED_IN_DOT_72
+#define LLDB_API_NEW_IN_DOT_73
+#define LLDB_API_DEPRECATED_IN_DOT_73
+#define LLDB_API_NEW_IN_DOT_74
+#define LLDB_API_DEPRECATED_IN_DOT_74
+#define LLDB_API_NEW_IN_DOT_75
+#define LLDB_API_DEPRECATED_IN_DOT_75
+#define LLDB_API_NEW_IN_DOT_76
+#define LLDB_API_DEPRECATED_IN_DOT_76
+#define LLDB_API_NEW_IN_DOT_77
+#define LLDB_API_DEPRECATED_IN_DOT_77
+#define LLDB_API_NEW_IN_DOT_78
+#define LLDB_API_DEPRECATED_IN_DOT_78
+#define LLDB_API_NEW_IN_DOT_79
+#define LLDB_API_DEPRECATED_IN_DOT_79
+#define LLDB_API_NEW_IN_DOT_80
+#define LLDB_API_DEPRECATED_IN_DOT_80
+#define LLDB_API_NEW_IN_DOT_81
+#define LLDB_API_DEPRECATED_IN_DOT_81
+#define LLDB_API_NEW_IN_DOT_82
+#define LLDB_API_DEPRECATED_IN_DOT_82
+#define LLDB_API_NEW_IN_DOT_83
+#define LLDB_API_DEPRECATED_IN_DOT_83
+#define LLDB_API_NEW_IN_DOT_84
+#define LLDB_API_DEPRECATED_IN_DOT_84
+#define LLDB_API_NEW_IN_DOT_85
+#define LLDB_API_DEPRECATED_IN_DOT_85
+#define LLDB_API_NEW_IN_DOT_86
+#define LLDB_API_DEPRECATED_IN_DOT_86
+#define LLDB_API_NEW_IN_DOT_87
+#define LLDB_API_DEPRECATED_IN_DOT_87
+#define LLDB_API_NEW_IN_DOT_88
+#define LLDB_API_DEPRECATED_IN_DOT_88
+#define LLDB_API_NEW_IN_DOT_89
+#define LLDB_API_DEPRECATED_IN_DOT_89
+#define LLDB_API_NEW_IN_DOT_90
+#define LLDB_API_DEPRECATED_IN_DOT_90
+#define LLDB_API_NEW_IN_DOT_91
+#define LLDB_API_DEPRECATED_IN_DOT_91
+#define LLDB_API_NEW_IN_DOT_92
+#define LLDB_API_DEPRECATED_IN_DOT_92
+#define LLDB_API_NEW_IN_DOT_93
+#define LLDB_API_DEPRECATED_IN_DOT_93
+#define LLDB_API_NEW_IN_DOT_94
+#define LLDB_API_DEPRECATED_IN_DOT_94
+#define LLDB_API_NEW_IN_DOT_95
+#define LLDB_API_DEPRECATED_IN_DOT_95
+#define LLDB_API_NEW_IN_DOT_96
+#define LLDB_API_DEPRECATED_IN_DOT_96
+#define LLDB_API_NEW_IN_DOT_97
+#define LLDB_API_DEPRECATED_IN_DOT_97
+#define LLDB_API_NEW_IN_DOT_98
+#define LLDB_API_DEPRECATED_IN_DOT_98
+#define LLDB_API_NEW_IN_DOT_99
+#define LLDB_API_DEPRECATED_IN_DOT_99
+#endif // defined(LLDB_CHECK_API_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED) && defined (LLDB_API_MAJOR_VERSION)
+
+#endif // LLDB_lldb_versioning_h_
diff --git a/kcov-38/src/CMakeLists.txt b/kcov-38/src/CMakeLists.txt
new file mode 100644
index 000000000000..3c120aa26b72
--- /dev/null
+++ b/kcov-38/src/CMakeLists.txt
@@ -0,0 +1,460 @@
+find_package (Threads)
+find_package (Bfd)
+
+include(TargetArch)
+target_architecture(CMAKE_TARGET_ARCHITECTURES)
+message(STATUS "Target architectures: ${CMAKE_TARGET_ARCHITECTURES}")
+
+find_package (ZLIB REQUIRED)
+find_package (CURL)
+
+if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+set (DL_LIBRARY "")
+else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+find_library (DL_LIBRARY NAMES dl)
+if (DL_LIBRARY)
+    message (STATUS "Found DL: ${DL_LIBRARY}")
+else (DL_LIBRARY)
+    message (FATAL_ERROR "Could NOT find DL")
+endif (DL_LIBRARY)
+endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+
+if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+find_library (INTL_LIBRARY NAMES intl)
+if (INTL_LIBRARY)
+    message (STATUS "Found INTL: ${INTL_LIBRARY}")
+else (INTL_LIBRARY)
+    message (FATAL_ERROR "Could NOT find INTL")
+endif (INTL_LIBRARY)
+else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+set (INTL_LIBRARY "")
+endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+
+find_library (M_LIBRARY NAMES m)
+if (M_LIBRARY)
+    message (STATUS "Found M: ${M_LIBRARY}")
+else (M_LIBRARY)
+    message (FATAL_ERROR "Could NOT find M")
+endif (M_LIBRARY)
+
+set (KCOV kcov)
+
+
+# See http://eatmyrandom.blogspot.se/2010/06/automate-version-numbering-using-git.html
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    find_program (GIT_EXECUTABLE NAMES git)
+    if (GIT_EXECUTABLE)
+        message (STATUS "Found Git: ${GIT_EXECUTABLE}")
+    else (GIT_EXECUTABLE)
+        message (FATAL_ERROR "Could NOT find Git")
+    endif (GIT_EXECUTABLE)
+
+    execute_process (COMMAND "${GIT_EXECUTABLE}"
+            "--git-dir=${CMAKE_SOURCE_DIR}/.git"
+            describe
+            --abbrev=4
+            HEAD
+        OUTPUT_VARIABLE POD_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+else (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    execute_process (COMMAND head
+            -n 1
+            "${CMAKE_SOURCE_DIR}/ChangeLog"
+        COMMAND cut -d \( -f 2
+        COMMAND cut -d \) -f 1
+        OUTPUT_VARIABLE POD_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+
+add_custom_command(
+    OUTPUT version.c
+    COMMAND "${CMAKE_COMMAND}"
+           -E echo
+           "const char *kcov_version = \\\"${POD_VERSION}\\\"\;"
+        > version.c
+)
+
+set (SOLIB kcov_sowrapper)
+
+set (${SOLIB}_SRCS
+	solib-parser/phdr_data.c
+	solib-parser/lib.c
+	)
+
+set (DISASSEMBLER_SRCS
+	parsers/dummy-disassembler.cc
+)
+
+set (HAS_LIBBFD "0")
+
+if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
+	if (LIBBFD_FOUND)
+		set (HAS_LIBBFD "1")
+		set (DISASSEMBLER_SRCS
+			parsers/bfd-disassembler.cc
+		)
+		set (DISASSEMBLER_LIBRARIES
+			${LIBBFD_OPCODES_LIBRARY}
+			${LIBBFD_BFD_LIBRARY}
+			${LIBBFD_IBERTY_LIBRARY}
+		)
+	endif (LIBBFD_FOUND)
+endif (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
+
+set (coveralls_SRCS writers/dummy-coveralls-writer.cc)
+
+if (CURL_FOUND)
+	set (coveralls_SRCS writers/coveralls-writer.cc)
+endif (CURL_FOUND)
+
+option (KCOV_STATIC_BUILD "Build a static binary" OFF)
+mark_as_advanced (KCOV_STATIC_BUILD)
+
+if (KCOV_STATIC_BUILD)
+	message (STATUS "Building a static binary (no Coveralls support)")
+
+	set (CURL_LIBRARIES "")
+	# Coveralls doesn't work in a static setting
+	set (coveralls_SRCS writers/dummy-coveralls-writer.cc)
+	set (CMAKE_EXE_LINKER_FLAGS "-static")
+endif (KCOV_STATIC_BUILD)
+
+set (ELF_SRCS
+	dummy-solib-handler.cc
+)
+set (MACHO_SRCS
+)
+set (SOLIB_generated )
+
+# Linux-specific sources
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	find_package (LibElf)
+	find_package (Elfutils)
+	set (ELF_SRCS
+		engines/clang-coverage-engine.cc
+		engines/ptrace.cc
+		engines/ptrace_linux.cc
+		engines/kernel-engine.cc
+		parsers/elf.cc
+		parsers/elf-parser.cc
+		parsers/dwarf.cc
+		solib-handler.cc
+		solib-parser/phdr_data.c
+	)
+	set (SOLIB_generated library.cc)
+	add_library (${SOLIB} SHARED ${${SOLIB}_SRCS})
+	set_target_properties(${SOLIB} PROPERTIES SUFFIX ".so")
+	target_link_libraries(${SOLIB} dl)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	find_package (LibElf)
+	find_package (Elfutils)
+	set (ELF_SRCS
+		engines/clang-coverage-engine.cc
+		engines/ptrace.cc
+		engines/ptrace_freebsd.cc
+		parsers/elf.cc
+		parsers/elf-parser.cc
+		parsers/dwarf.cc
+		solib-handler.cc
+		solib-parser/phdr_data.c
+	)
+	set (SOLIB_generated library.cc)
+	add_library (${SOLIB} SHARED ${${SOLIB}_SRCS})
+	set_target_properties(${SOLIB} PROPERTIES SUFFIX ".so")
+else (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	find_library(LLDB_LIBRARY
+      NAMES
+	    LLDB
+	  PATHS
+        "/usr/lib"
+        "/usr/lib64"
+        "/usr/local/lib"
+        "/usr/local/lib64"
+        "/opt/local/lib"
+        "/opt/usr/lib64"
+		"/Library/Developer/CommandLineTools/Library/PrivateFrameworks"
+		"/Applications/Xcode.app/Contents/SharedFrameworks"
+		ENV LIBRARY_PATH
+		ENV LD_LIBRARY_PATH
+	)
+	mark_as_advanced(LLDB_LIBRARY)
+	if(LLDB_LIBRARY)
+	  message (STATUS "Found LLDB: ${LLDB_LIBRARY}")
+	endif()
+
+	# Not really true, but anyway
+	set(LIBELF_FOUND 1)
+
+	set (MACHO_SRCS
+		engines/lldb-engine.cc
+	)
+endif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
+set (${KCOV}_SRCS
+    capabilities.cc
+    collector.cc
+    configuration.cc
+    engine-factory.cc
+    engines/bash-engine.cc
+    engines/system-mode-engine.cc
+    engines/system-mode-file-format.cc
+    engines/python-engine.cc
+    filter.cc
+    gcov.cc
+    main.cc
+    merge-file-parser.cc
+    output-handler.cc
+    ${DISASSEMBLER_SRCS}
+    parser-manager.cc
+    reporter.cc
+    source-file-cache.cc
+    utils.cc
+    writers/cobertura-writer.cc
+    writers/json-writer.cc
+    ${coveralls_SRCS}
+    writers/html-writer.cc
+    writers/sonarqube-xml-writer.cc
+    writers/writer-base.cc
+    ${ELF_SRCS}
+    ${MACHO_SRCS}
+    include/capabilities.hh
+    include/gcov.hh
+    include/reporter.hh
+    include/collector.hh
+    include/generated-data-base.hh
+    include/solib-handler.hh
+    include/configuration.hh
+    include/lineid.hh
+    include/swap-endian.hh
+    include/engine.hh
+    include/manager.hh
+    include/utils.hh
+    include/file-parser.hh
+    include/output-handler.hh
+    include/writer.hh
+    include/filter.hh
+    include/phdr_data.h
+    system-mode/file-data.cc
+    )
+
+set (KCOV_SYSTEM_MODE_SRCS
+    configuration.cc
+	dummy-solib-handler.cc
+    engine-factory.cc
+    engines/system-mode-file-format.cc
+    engines/ptrace.cc
+    engines/ptrace_linux.cc
+    filter.cc
+    gcov.cc
+    include/capabilities.hh
+    include/collector.hh
+    include/configuration.hh
+    include/engine.hh
+    include/file-parser.hh
+    include/filter.hh
+    include/gcov.hh
+    include/generated-data-base.hh
+    include/lineid.hh
+    include/manager.hh
+    include/output-handler.hh
+    include/phdr_data.h
+    include/reporter.hh
+    include/solib-handler.hh
+    include/swap-endian.hh
+    include/utils.hh
+    include/writer.hh
+    main-system-daemon.cc
+    parser-manager.cc
+	system-mode/file-data.cc
+	system-mode/registration.cc
+    utils.cc
+)
+
+set (KCOV_LIBRARY_PREFIX "/tmp")
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD}")
+
+include_directories(
+	include/
+	../external/lldb/include/
+	${ZLIB_INCLUDE_DIR}
+	)
+
+if (LIBDW_FOUND)
+    include_directories(${LIBDW_INCLUDE_DIRS})
+endif (LIBDW_FOUND)
+
+if (LIBELF_FOUND)
+    include_directories(${LIBELF_INCLUDE_DIRS})
+endif (LIBELF_FOUND)
+
+if (CURL_FOUND)
+    include_directories(${CURL_INCLUDE_DIRS})
+endif (CURL_FOUND)
+
+add_library (bash_execve_redirector SHARED engines/bash-execve-redirector.c)
+set_target_properties(bash_execve_redirector PROPERTIES SUFFIX ".so")
+target_link_libraries(bash_execve_redirector ${DL_LIBRARY})
+
+add_library (kcov_system_lib SHARED engines/system-mode-binary-lib.cc utils.cc system-mode/registration.cc)
+set_target_properties(kcov_system_lib PROPERTIES SUFFIX ".so")
+target_link_libraries(kcov_system_lib
+    "${DL_LIBRARY}"
+)
+
+
+add_custom_command(
+    OUTPUT library.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            lib${SOLIB}.so
+            __library
+        > library.cc
+    DEPENDS
+        ${SOLIB}
+        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+add_custom_command(
+    OUTPUT bash-redirector-library.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            $<TARGET_FILE:bash_execve_redirector>
+            bash_redirector_library
+        > bash-redirector-library.cc
+    DEPENDS
+        bash_execve_redirector
+        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+add_custom_command(
+    OUTPUT kcov-system-library.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            $<TARGET_FILE:kcov_system_lib>
+            kcov_system_library
+        > kcov-system-library.cc
+    DEPENDS
+        kcov_system_lib
+       "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+add_custom_command(
+    OUTPUT python-helper.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            "${CMAKE_CURRENT_SOURCE_DIR}/engines/python-helper.py"
+            python_helper
+        > python-helper.cc
+    DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/engines/python-helper.py"
+        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+add_custom_command(
+    OUTPUT bash-helper.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper.sh"
+            bash_helper
+            "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper-debug-trap.sh"
+            bash_helper_debug_trap
+        > bash-helper.cc
+    DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper-debug-trap.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+add_custom_command(
+    OUTPUT html-data-files.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/bcov.css" css_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/amber.png" icon_amber
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/glass.png" icon_glass
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/source-file.html" source_file_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/index.html" index_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/handlebars.js" handlebars_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/kcov.js" kcov_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.min.js" jquery_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.min.js" tablesorter_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.widgets.min.js" tablesorter_widgets_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../data/tablesorter-theme.css" tablesorter_theme_text
+        > html-data-files.cc
+    DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/bcov.css"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/amber.png"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/glass.png"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/source-file.html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/index.html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/handlebars.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/kcov.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.widgets.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../data/tablesorter-theme.css"
+        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
+)
+
+# Reference: http://www.cmake.org/Wiki/CMake_RPATH_handling
+if (SPECIFY_RPATH)
+	set (CMAKE_SKIP_BUILD_RPATH OFF)
+	set (CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
+	set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
+	# the RPATH to be used when installing, but only if it's not a system directory
+	list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" IS_SYSTEM_DIR)
+	if (IS_SYSTEM_DIR EQUAL -1)
+	    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+	endif (IS_SYSTEM_DIR EQUAL -1)
+endif (SPECIFY_RPATH)
+
+if (LIBELF_FOUND)
+	add_executable (${KCOV} ${${KCOV}_SRCS} ${SOLIB_generated} bash-redirector-library.cc python-helper.cc bash-helper.cc kcov-system-library.cc html-data-files.cc version.c)
+
+	target_link_libraries(${KCOV}
+		stdc++
+		${CMAKE_THREAD_LIBS_INIT}
+		${CURL_LIBRARIES}
+		"${DL_LIBRARY}"
+		"${INTL_LIBRARY}"
+		${DISASSEMBLER_LIBRARIES}
+		${LIBDW_LIBRARIES}
+		${LIBELF_LIBRARIES}
+		${LLDB_LIBRARY}
+		"${M_LIBRARY}"
+		${ZLIB_LIBRARIES}
+	)
+	install (TARGETS ${KCOV} DESTINATION "${KCOV_INSTALL_BINDIR}")
+endif (LIBELF_FOUND)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    add_executable (kcov-system-daemon ${KCOV_SYSTEM_MODE_SRCS} version.c)
+
+    target_link_libraries(kcov-system-daemon
+        stdc++
+        ${CMAKE_THREAD_LIBS_INIT}
+        "${DL_LIBRARY}"
+        "${M_LIBRARY}"
+        ${ZLIB_LIBRARIES}
+	)
+	install (TARGETS kcov-system-daemon DESTINATION "${KCOV_INSTALL_BINDIR}")
+endif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    get_filename_component(LLDB_LIBRARY_NAME "${LLDB_LIBRARY}" NAME)
+    if(LLDB_LIBRARY_NAME STREQUAL "LLDB.framework")
+      set(LLDB_LIBRARY_INSTALL_NAME "${LLDB_LIBRARY}/Versions/Current/LLDB")
+	  add_custom_command(TARGET ${KCOV}
+        POST_BUILD COMMAND
+        "${CMAKE_INSTALL_NAME_TOOL}" -change @rpath/LLDB.framework/LLDB "${LLDB_LIBRARY_INSTALL_NAME}" $<TARGET_FILE:${KCOV}>
+        COMMENT "Changing LLDB install name from @rpath/LLDB.framework/LLDB to ${LLDB_LIBRARY_INSTALL_NAME}")
+	endif()
+endif()
+
+# uninstall target
+if(NOT TARGET uninstall)
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+        IMMEDIATE @ONLY)
+
+    add_custom_target(uninstall
+        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+endif()
diff --git a/kcov-38/src/bin-to-c-source.py b/kcov-38/src/bin-to-c-source.py
new file mode 100755
index 000000000000..f46cf1d201a2
--- /dev/null
+++ b/kcov-38/src/bin-to-c-source.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import sys, struct
+
+def generate(data_in, base_name):
+	print("const uint8_t %s_data_raw[] = {" % (base_name))
+
+	for i in range(0, len(data), 20):
+		line = bytearray(data[i:i+20])
+
+		for val in line:
+			print("0x%02x," % (val), end="")
+		print("")
+
+	print("};")
+	print("GeneratedData %s_data(%s_data_raw, sizeof(%s_data_raw));" % (base_name, base_name, base_name))
+
+if __name__ == "__main__":
+	if len(sys.argv) < 3 or (len(sys.argv) - 1) % 2 != 0:
+		print("Usage: bin-to-source.py <file> <base-name> [<file2> <base-name2>]")
+		sys.exit(1)
+
+	print("#include <stdint.h>")
+	print("#include <stdlib.h>")
+	print("#include <generated-data-base.hh>")
+	print("using namespace kcov;")
+
+	for i in range(1,len(sys.argv), 2):
+		file = sys.argv[i]
+		base_name = sys.argv[i + 1]
+
+		f = open(file, "rb")
+		data = f.read()
+		f.close()
+
+		generate(data, base_name)
diff --git a/kcov-38/src/capabilities.cc b/kcov-38/src/capabilities.cc
new file mode 100644
index 000000000000..b6fd3c4b521c
--- /dev/null
+++ b/kcov-38/src/capabilities.cc
@@ -0,0 +1,49 @@
+#include <capabilities.hh>
+#include <utils.hh>
+
+#include <unordered_map>
+
+using namespace kcov;
+
+class Capabilities : public ICapabilities
+{
+public:
+	Capabilities()
+	{
+		m_capabilities["handle-solibs"] = false;
+	}
+
+	void addCapability(const std::string &name)
+	{
+		validateCapability(name);
+		m_capabilities[name] = true;
+	}
+
+	void removeCapability(const std::string &name)
+	{
+		validateCapability(name);
+		m_capabilities[name] = false;
+	}
+
+	bool hasCapability(const std::string &name)
+	{
+		validateCapability(name);
+
+		return m_capabilities[name];
+	}
+
+private:
+	void validateCapability(const std::string &name)
+	{
+		panic_if(m_capabilities.find(name) == m_capabilities.end(),
+				"Capability %s not present", name.c_str());
+	}
+
+	std::unordered_map<std::string, bool> m_capabilities;
+};
+
+static Capabilities g_capabilities;
+ICapabilities &ICapabilities::getInstance()
+{
+	return g_capabilities;
+}
diff --git a/kcov-38/src/cmake_uninstall.cmake.in b/kcov-38/src/cmake_uninstall.cmake.in
new file mode 100644
index 000000000000..4457d1bd712a
--- /dev/null
+++ b/kcov-38/src/cmake_uninstall.cmake.in
@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    exec_program(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
\ No newline at end of file
diff --git a/kcov-38/src/collector.cc b/kcov-38/src/collector.cc
new file mode 100644
index 000000000000..4d94b98244bf
--- /dev/null
+++ b/kcov-38/src/collector.cc
@@ -0,0 +1,198 @@
+#include <collector.hh>
+#include <file-parser.hh>
+#include <utils.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <filter.hh>
+#include <signal.h>
+
+#include <unordered_map>
+#include <string>
+#include <vector>
+
+using namespace kcov;
+
+class Collector : public ICollector,
+		public IFileParser::ILineListener,
+		public IEngine::IEventListener
+{
+public:
+	Collector(IFileParser &fileParser, IEngine &engine, IFilter &filter) :
+			m_fileParser(fileParser), m_engine(engine), m_exitCode(-1), m_filter(
+					filter)
+	{
+		m_fileParser.registerLineListener(*this);
+	}
+
+	void registerListener(ICollector::IListener &listener)
+	{
+		m_listeners.push_back(&listener);
+	}
+
+	void registerEventTickListener(IEventTickListener &listener)
+	{
+		m_eventTickListeners.push_back(&listener);
+	}
+
+	int run(const std::string &filename)
+	{
+		if (!m_engine.start(*this, filename))
+		{
+			error("Can't start/attach to %s", filename.c_str());
+			return -1;
+		}
+
+		// This will set all breakpoints
+		m_fileParser.parse();
+
+		while (1)
+		{
+			bool shouldContinue = m_engine.continueExecution();
+
+			tick();
+
+			if (!shouldContinue)
+				break;
+		}
+
+		return m_exitCode;
+	}
+
+	virtual void stop()
+	{
+	}
+
+private:
+	void tick()
+	{
+		for (EventTickListenerList_t::iterator it =
+				m_eventTickListeners.begin(); it != m_eventTickListeners.end();
+				++it)
+			(*it)->onTick();
+	}
+
+	std::string eventToName(IEngine::Event ev)
+	{
+		switch (ev.type)
+		{
+		case ev_breakpoint:
+			return fmt("breakpoint at 0x%llx", (unsigned long long) ev.addr);
+		case ev_exit:
+			return fmt("exit code %d", ev.data);
+		case ev_signal:
+		case ev_signal_exit:
+		{
+			if (ev.data == SIGABRT)
+				return std::string("SIGABRT");
+			if (ev.data == SIGSEGV)
+				return std::string("SIGSEGV");
+			if (ev.data == SIGILL)
+				return std::string("SIGILL");
+			if (ev.data == SIGTERM)
+				return std::string("SIGTERM");
+			if (ev.data == SIGINT)
+				return std::string("SIGINT");
+			if (ev.data == SIGBUS)
+				return std::string("SIGBUS");
+			if (ev.data == SIGFPE)
+				return std::string("SIGFPE");
+
+			return fmt("unknown signal %d", ev.data);
+		}
+		case ev_error:
+			return std::string("error");
+		default:
+			break;
+		}
+
+		return std::string("unknown");
+	}
+
+	// From IEngine
+	void onEvent(const IEngine::Event &ev)
+	{
+		switch (ev.type)
+		{
+		case ev_error:
+			break;
+		case ev_signal:
+			break;
+		case ev_signal_exit:
+			kcov_debug(STATUS_MSG,
+					"kcov: Process exited with signal %d (%s) at 0x%llx\n",
+					ev.data, eventToName(ev).c_str(),
+					(unsigned long long) ev.addr);
+
+			if (ev.data == SIGILL)
+				kcov_debug(STATUS_MSG,
+						"\nkcov: Illegal instructions are sometimes caused by some GCC versions\n"
+								"kcov: miscompiling C++ headers. If the problem is persistent, try running\n"
+								"kcov: with --verify. For more information, see\n"
+								"kcov: http://github.com/SimonKagstrom/kcov/issues/18\n"
+#if KCOV_HAS_LIBBFD == 0
+						"\n"
+						"kcov: WARNING: kcov has been built without libbfd-dev (or\n"
+						"kcov: binutils-dev), so the --verify option will not do anything."
+#endif
+						);
+
+			break;
+
+		case ev_exit_first_process:
+			if (IConfiguration::getInstance().keyAsInt(
+					"daemonize-on-first-process-exit"))
+			{
+				IConfiguration &conf = IConfiguration::getInstance();
+				std::string fifoName = conf.keyAsString("target-directory")
+						+ "/done.fifo";
+
+				std::string exitCode = fmt("%u", ev.data);
+
+				write_file(exitCode.c_str(), exitCode.size(), "%s",
+						fifoName.c_str());
+			}
+			m_exitCode = ev.data;
+			break;
+		case ev_exit:
+			m_exitCode = ev.data;
+			break;
+		case ev_breakpoint:
+			for (ListenerList_t::const_iterator it = m_listeners.begin();
+					it != m_listeners.end(); ++it)
+				(*it)->onAddressHit(ev.addr, 1);
+
+			break;
+
+		default:
+			panic("Unknown event %d", ev.type);
+		}
+	}
+
+	// From IFileParser
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+		if (!m_filter.runFilters(file))
+		{
+			return;
+		}
+
+		m_engine.registerBreakpoint(addr);
+	}
+
+	typedef std::vector<ICollector::IListener *> ListenerList_t;
+	typedef std::vector<ICollector::IEventTickListener *> EventTickListenerList_t;
+
+	IFileParser &m_fileParser;
+	IEngine &m_engine;
+	ListenerList_t m_listeners;
+	EventTickListenerList_t m_eventTickListeners;
+	int m_exitCode;
+
+	IFilter &m_filter;
+};
+
+ICollector &ICollector::create(IFileParser &elf, IEngine &engine,
+		IFilter &filter)
+{
+	return *new Collector(elf, engine, filter);
+}
diff --git a/kcov-38/src/configuration.cc b/kcov-38/src/configuration.cc
new file mode 100644
index 000000000000..90f3805b5922
--- /dev/null
+++ b/kcov-38/src/configuration.cc
@@ -0,0 +1,809 @@
+#include <configuration.hh>
+#include <file-parser.hh>
+#include <utils.hh>
+#include <stdlib.h>
+#include <getopt.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <map>
+#include <list>
+#include <string>
+#include <stdexcept>
+#include <unordered_map>
+#include <iostream>
+using namespace kcov;
+
+extern "C" const char *kcov_version;
+
+class Configuration : public IConfiguration
+{
+public:
+	Configuration()
+	{
+		m_programArgs = NULL;
+		m_argc = 0;
+		m_printUncommon = false;
+
+		setupDefaults();
+	}
+
+	const std::string &keyAsString(const std::string &key)
+	{
+		panic_if(m_strings.find(key) == m_strings.end(), "key %s not found",
+				key.c_str());
+
+		return m_strings[key];
+	}
+
+	int keyAsInt(const std::string &key)
+	{
+		panic_if(m_ints.find(key) == m_ints.end(), "key %s not found",
+				key.c_str());
+
+		return m_ints[key];
+	}
+
+	const std::vector<std::string> &keyAsList(const std::string &key)
+	{
+		panic_if(m_stringVectors.find(key) == m_stringVectors.end(),
+				"key %s not found", key.c_str());
+
+		return m_stringVectors[key];
+	}
+
+	bool usage(void)
+	{
+		printf(
+				"Usage: kcov [OPTIONS] out-dir in-file [args...]\n"
+						"\n"
+						"Where [OPTIONS] are\n"
+						" -h, --help              this text\n"
+						" --version               print the version of kcov\n"
+						" -p, --pid=PID           trace PID instead of executing in-file,\n"
+						"                         in-file is optional on Linux in this case\n"
+						" -l, --limits=low,high   setup limits for low/high coverage (default %u,%u)\n"
+						"\n"
+						" --collect-only          Only collect coverage data (don't produce HTML/\n"
+						"                         Cobertura output)\n"
+						" --report-only           Produce output from stored databases, don't collect\n"
+						" --merge                 Merge output from multiple source dirs\n"
+						"\n"
+						" --include-path=path     comma-separated paths to include in the coverage report\n"
+						" --exclude-path=path     comma-separated paths to exclude from the coverage\n"
+						"                         report\n"
+						" --include-pattern=pat   comma-separated path patterns to include in the\n"
+						"                         coverage report\n"
+						" --exclude-pattern=pat   comma-separated path patterns to exclude from the \n"
+						"                         coverage report\n"
+						" --exclude-line=pat[,...] Consider lines that match the patterns to be non-\n"
+						"                         code lines.\n"
+						" --exclude-region=start:stop[,...] Exclude regions of code between start:stop\n"
+						"                         markers (e.g., within comments) as non-code lines.\n"
+						" --clean                 don't accumulate data from multiple runs\n"
+						"\n"
+						" --coveralls-id=id       Travis CI job ID or secret repo_token for uploads to\n"
+						"                         Coveralls.io\n"
+						" --strip-path=path       If not set, max common path will be stripped away.\n"
+						"%s"
+						"\n"
+						"Examples:\n"
+						"  kcov /tmp/kcov ./frodo                        # Check coverage for ./frodo\n"
+						"  kcov --pid=1000 /tmp/kcov                     # Check coverage for PID 1000\n"
+						"  kcov --include-pattern=/src/frodo/ /tmp/kcov ./frodo # Only include files\n"
+						"                                                       # including /src/frodo\n"
+						"  kcov --collect-only /tmp/kcov ./frodo  # Collect coverage, don't report\n"
+						"  kcov --report-only /tmp/kcov ./frodo   # Report coverage collected above\n"
+						"  kcov --merge /tmp/out /tmp/dir1 /tmp/dir2     # Merge the dir1/dir2 reports\n"
+						"  kcov --system-record /tmp/out-dir sysroot     # Perform full-system in-\n"
+						"                                                  strumentation for sysroot\n"
+						"  kcov --system-report  /tmp/data-dir           # Report all data from a full-\n"
+						"                                                  system run.\n"
+						"", keyAsInt("low-limit"), keyAsInt("high-limit"),
+				uncommonOptions().c_str());
+
+		return false;
+	}
+
+	void printUsage()
+	{
+		usage();
+	}
+
+	bool parse(unsigned int argc, const char *argv[])
+	{
+		static const struct option long_options[] =
+		{
+		{ "help", no_argument, 0, 'h' },
+		{ "pid", required_argument, 0, 'p' },
+		{ "limits", required_argument, 0, 'l' },
+		{ "output-interval", required_argument, 0, 'O' },
+		{ "path-strip-level", required_argument, 0, 'S' },
+		{ "skip-solibs", no_argument, 0, 'L' },
+		{ "exit-first-process", no_argument, 0, 'F' },
+		{ "gcov", no_argument, 0, 'g' },
+		{ "clang", no_argument, 0, 'c' },
+		{ "configure", required_argument, 0, 'M' },
+		{ "clean", no_argument, 0, 'E' },
+		{ "exclude-pattern", required_argument, 0, 'x' },
+		{ "include-pattern", required_argument, 0, 'i' },
+		{ "exclude-path", required_argument, 0, 'X' },
+		{ "include-path", required_argument, 0, 'I' },
+		{ "coveralls-id", required_argument, 0, 'T' },
+		{ "strip-path", required_argument, 0, 'Z' },
+		{ "exclude-line", required_argument, 0, 'u' },
+		{ "exclude-region", required_argument, 0, 'G' },
+		{ "debug", required_argument, 0, 'D' },
+		{ "debug-force-bash-stderr", no_argument, 0, 'd' },
+		{ "bash-handle-sh-invocation", no_argument, 0, 's' },
+		{ "bash-dont-parse-binary-dir", no_argument, 0, 'j' },
+		{ "bash-parse-files-in-dirs", required_argument, 0, 'J' },
+		{ "replace-src-path", required_argument, 0, 'R' },
+		{ "collect-only", no_argument, 0, 'C' },
+		{ "report-only", no_argument, 0, 'r' },
+		{ "merge", no_argument, 0, 'm' },
+		{ "python-parser", required_argument, 0, 'P' },
+		{ "patchelf", required_argument, 0, 'e' },
+		{ "bash-parser", required_argument, 0, 'B' },
+		{ "bash-method", required_argument, 0, '4' },
+		{ "system-record", no_argument, 0, '8' },
+		{ "system-report", no_argument, 0, '9' },
+		{ "verify", no_argument, 0, 'V' },
+		{ "version", no_argument, 0, 'v' },
+		{ "uncommon-options", no_argument, 0, 'U' },
+		/*{"write-file", required_argument, 0, 'w'}, Take back when the kernel stuff works */
+		/*{"read-file", required_argument, 0, 'r'}, Ditto */
+		{ 0, 0, 0, 0 } };
+		unsigned int afterOpts = 0;
+		unsigned int extraNeeded = 2;
+		unsigned int lastArg;
+
+		setupDefaults();
+
+		const char *path = getenv("PATH");
+
+		if (!path)
+			path = "";
+
+		std::vector<std::string> paths = split_string(path, ":");
+
+		/* Scan through the parameters for an ELF file: That will be the
+		 * second last argument in the list.
+		 *
+		 * After that it's arguments to the external program.
+		 */
+		for (lastArg = 1; lastArg < argc; lastArg++)
+		{
+			if (IParserManager::getInstance().matchParser(argv[lastArg]))
+				break;
+
+			bool found = false;
+			for (std::vector<std::string>::const_iterator it = paths.begin();
+					it != paths.end(); ++it)
+			{
+				const std::string &curPath = *it;
+				const std::string cur = get_real_path(
+						curPath + "/" + argv[lastArg]);
+				struct stat st;
+
+				if (lstat(cur.c_str(), &st) < 0)
+					continue;
+
+				// Regular file?
+				if (S_ISREG(st.st_mode) == 0)
+					continue;
+
+				// Executable?
+				if ((st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)
+					continue;
+
+				if (IParserManager::getInstance().matchParser(cur))
+				{
+					// Intentional memory leak
+					argv[lastArg] = xstrdup(cur.c_str());
+					found = true;
+					break;
+				}
+			}
+
+			if (found)
+				break;
+		}
+
+		bool printUsage = false;
+
+		/* Hooray for reentrancy... */
+		optind = 0;
+		optarg = 0;
+		while (1)
+		{
+			int option_index = 0;
+			int c;
+
+			c = getopt_long(lastArg, (char **) argv, "hp:s:l:t:", long_options,
+					&option_index);
+
+			/* No more options */
+			if (c == -1)
+				break;
+
+			switch (c)
+			{
+			case 0:
+				break;
+			case 'h':
+				printUsage = true;
+				break;
+			case 'U':
+				m_printUncommon = true;
+				break;
+			case 'V':
+				setKey("verify", 1);
+#if KCOV_HAS_LIBBFD == 0
+				warning(
+						"kcov: WARNING: kcov has been built without libbfd-dev (or\n"
+								"kcov: binutils-dev), so the --verify option will not do anything.\n");
+#endif
+				break;
+			case 'v':
+				printf("kcov %s\n", kcov_version);
+				exit(0);
+				break;
+			case 'L':
+				setKey("parse-solibs", 0);
+				break;
+			case 'F':
+				setKey("daemonize-on-first-process-exit", 1);
+				break;
+			case 'g':
+				setKey("gcov", 1);
+				break;
+			case 'c':
+				setKey("clang-sanitizer", 1);
+				break;
+			case 'E':
+				setKey("clean-output", 1);
+				break;
+			case 'p':
+			{
+				if (!isInteger(std::string(optarg)))
+					return usage();
+
+				unsigned long pid = stoul(std::string(optarg));
+				setKey("attach-pid", pid);
+
+				// Linux can derive this from /proc
+				if (file_exists(fmt("/proc/%lu/exe", pid)))
+				{
+					extraNeeded = 1;
+				}
+				break;
+			}
+			case 'O':
+				if (!isInteger(std::string(optarg)))
+					return usage();
+
+				setKey("output-interval", stoul(std::string(optarg)));
+				break;
+			case 'S':
+			{
+				if (!isInteger(std::string(optarg)))
+					return usage();
+
+				int pathStripLevel = stoul(std::string(optarg));
+				if (pathStripLevel == 0)
+					pathStripLevel = INT_MAX;
+				setKey("path-strip-level", pathStripLevel);
+				break;
+			}
+			case 'D':
+				if (!isInteger(std::string(optarg)))
+					return usage();
+				g_kcov_debug_mask = stoul(std::string(optarg));
+				break;
+			case 'M':
+			{
+				std::vector<std::string> values = split_string(optarg, ",");
+
+				for (std::vector<std::string>::const_iterator it =
+						values.begin(); it != values.end(); ++it)
+				{
+					std::vector<std::string> keyValue = split_string(*it, "=");
+
+					if (keyValue.size() != 2)
+					{
+						error("--configure needs key=value pairs\n");
+						return usage();
+					}
+
+					configure(keyValue[0], keyValue[1]);
+				}
+
+				break;
+			}
+			case 'i':
+				setKey("include-pattern",
+						getCommaSeparatedList(std::string(optarg)));
+				break;
+			case 'P':
+				setKey("python-command", optarg);
+				break;
+			case 'e':
+				setKey("patchelf-command", optarg);
+				break;
+			case 'B':
+				setKey("bash-command", optarg);
+				break;
+			case 'T':
+				setKey("coveralls-id", optarg);
+				break;
+			case 'Z':
+				setKey("strip-path", std::string(optarg));
+				break;
+			case 'u':
+				setKey("exclude-line", std::string(optarg));
+				break;
+			case 'G':
+				setKey("exclude-region", std::string(optarg));
+				break;
+			case 'x':
+				setKey("exclude-pattern",
+						getCommaSeparatedList(std::string(optarg)));
+				break;
+			case 'I':
+			{
+				StrVecMap_t onlyIncludePath = getCommaSeparatedList(
+						std::string(optarg));
+				expandPath(onlyIncludePath);
+
+				setKey("include-path", onlyIncludePath);
+				break;
+			}
+			case 'X':
+			{
+				StrVecMap_t excludePath = getCommaSeparatedList(
+						std::string(optarg));
+				expandPath(excludePath);
+
+				setKey("exclude-path", excludePath);
+				break;
+			}
+			case 'd':
+				setKey("bash-force-stderr-input", 1);
+				setKey("bash-use-ps4", 1); // Needed in this mode
+				break;
+			case 's':
+				setKey("bash-handle-sh-invocation", 1);
+				break;
+			case '4':
+			{
+				std::string s(optarg);
+
+				if (s == "DEBUG")
+					setKey("bash-use-ps4", 0);
+				else if (s == "PS4")
+					setKey("bash-use-ps4", 1);
+				else
+					panic("Invalid bash method: Use PS4 or DEBUG\n");
+			}
+				break;
+			case 'C':
+				setKey("running-mode", IConfiguration::MODE_COLLECT_ONLY);
+				break;
+			case 'r':
+				setKey("running-mode", IConfiguration::MODE_REPORT_ONLY);
+				break;
+			case 'm':
+				setKey("running-mode", IConfiguration::MODE_MERGE_ONLY);
+				break;
+			case '8': // Full system record
+				setKey("running-mode", IConfiguration::MODE_SYSTEM_RECORD);
+				setKey("parse-solibs", 0); // Not applicable
+				break;
+			case '9': // Full system report
+				setKey("running-mode", IConfiguration::MODE_SYSTEM_REPORT);
+				setKey("parse-solibs", 0);
+				break;
+			case 'l':
+			{
+				StrVecMap_t vec = getCommaSeparatedList(std::string(optarg));
+
+				if (vec.size() != 2)
+					return usage();
+
+				if (!isInteger(vec[0]) || !isInteger(vec[1]))
+					return usage();
+
+				setKey("low-limit", stoul(vec[0]));
+				setKey("high-limit", stoul(vec[1]));
+				break;
+			}
+			case 'j':
+				setKey("bash-parse-binary-dir", 0);
+				break;
+			case 'J':
+			{
+				StrVecMap_t bashFilesInPath = getCommaSeparatedList(
+						std::string(optarg));
+
+				setKey("bash-parse-file-dir", bashFilesInPath);
+				break;
+			}
+			case 'R':
+			{
+				std::string tmpArg = std::string(optarg);
+				size_t tokenPosFront = tmpArg.find_first_of(":");
+				size_t tokenPosBack = tmpArg.find_last_of(":");
+
+				if ((tokenPosFront != std::string::npos)
+						&& (tokenPosFront == tokenPosBack))
+				{
+
+					std::string originalPathPrefix = tmpArg.substr(0,
+							tokenPosFront);
+					std::string newPathPrefix = tmpArg.substr(
+							tokenPosFront + 1);
+
+					char* rp = ::realpath(newPathPrefix.c_str(), NULL);
+					if (rp)
+					{
+						free((void*) rp);
+					}
+					else
+					{
+						panic("%s is not a valid path.\n",
+								newPathPrefix.c_str());
+					}
+
+					setKey("orig-path-prefix", originalPathPrefix);
+					setKey("new-path-prefix", newPathPrefix);
+				}
+				else
+				{
+					panic("%s is formatted incorrectly\n", tmpArg.c_str());
+
+				}
+				break;
+			}
+			default:
+				error("Unrecognized option: -%c\n", optopt);
+				return usage();
+			}
+		}
+
+		if (printUsage)
+			return usage();
+
+		afterOpts = optind;
+
+		/* When tracing by PID, the filename is optional */
+		if (argc < afterOpts + extraNeeded)
+			return usage();
+
+		std::string outDirectory = argv[afterOpts];
+		if (outDirectory[outDirectory.size() - 1] != '/')
+			outDirectory += "/";
+
+		setKey("out-directory", outDirectory);
+		if (keyAsInt("running-mode") == IConfiguration::MODE_MERGE_ONLY)
+		{
+			// argv contains the directories to merge in this case, but we have no binary name etc
+			setKey("binary-name", "merged-kcov-output");
+			setKey("target-directory", outDirectory + "/merged-kcov-output");
+		}
+		else
+		{
+			std::string binaryName;
+			std::string path;
+
+			if (keyAsInt("attach-pid") == 0)
+			{
+				path = argv[afterOpts + 1];
+			}
+			else
+			{
+				// Trace by PID - derive from /proc/$pid/exe on Linux
+				int pid = keyAsInt("attach-pid");
+				path = get_real_path(fmt("/proc/%d/exe", pid));
+
+				if (!file_exists(path))
+				{
+					if (argc < afterOpts + 1)
+						usage();
+					path = argv[afterOpts + 1];
+				}
+			}
+
+			path = get_real_path(path);
+			std::pair<std::string, std::string> tmp = split_path(path);
+
+			setKey("binary-path", tmp.first);
+			binaryName = tmp.second;
+
+			setKey("target-directory",
+					fmt("%s/%s.%08zx", outDirectory.c_str(), binaryName.c_str(),
+							std::hash<std::string>()(tmp.first)));
+
+			setKey("binary-name", binaryName);
+
+			if (keyAsString("command-name") == "")
+				setKey("command-name", binaryName);
+		}
+
+		m_programArgs = &argv[afterOpts + 1];
+		m_argc = argc - afterOpts - 1;
+
+		return true;
+	}
+
+	const char **getArgv()
+	{
+		return m_programArgs;
+	}
+
+	unsigned int getArgc()
+	{
+		return m_argc;
+	}
+
+	void registerListener(IListener &listener,
+			const std::vector<std::string> &keys)
+	{
+		for (std::vector<std::string>::const_iterator it = keys.begin();
+				it != keys.end(); ++it)
+			m_listeners[*it] = &listener;
+	}
+
+	// "private", but we ignore that in the unit test
+	typedef std::vector<std::string> StrVecMap_t;
+
+	typedef std::unordered_map<std::string, std::string> StringKeyMap_t;
+	typedef std::unordered_map<std::string, int> IntKeyMap_t;
+	typedef std::unordered_map<std::string, StrVecMap_t> StrVecKeyMap_t;
+
+	typedef std::unordered_map<std::string, IListener *> ListenerMap_t;
+
+	// Setup the default key:value pairs
+	void setupDefaults()
+	{
+		setKey("binary-path", "");
+		setKey("python-command", "python");
+#ifdef __FreeBSD__
+		setKey("bash-command", "/usr/local/bin/bash");
+#else
+		setKey("bash-command", "/bin/bash");
+#endif
+		setKey("kernel-coverage-path", "/sys/kernel/debug/kprobe-coverage");
+		setKey("path-strip-level", 2);
+		setKey("attach-pid", 0);
+		setKey("parse-solibs", 1);
+		setKey("gcov", 0);
+		setKey("clang-sanitizer", 0);
+		setKey("clean-output", 0);
+		setKey("low-limit", 25);
+		setKey("high-limit", 75);
+		setKey("output-interval", 5000);
+		setKey("daemonize-on-first-process-exit", 0);
+		setKey("coveralls-id", "");
+		setKey("strip-path", "");
+		setKey("exclude-line", "");
+		setKey("exclude-region", "");
+		setKey("orig-path-prefix", "");
+		setKey("new-path-prefix", "");
+		setKey("running-mode", IConfiguration::MODE_COLLECT_AND_REPORT);
+		setKey("exclude-pattern", StrVecMap_t());
+		setKey("include-pattern", StrVecMap_t());
+		setKey("exclude-path", StrVecMap_t());
+		setKey("include-path", StrVecMap_t());
+		setKey("bash-force-stderr-input", 0);
+		setKey("bash-handle-sh-invocation", 0);
+		setKey("bash-use-basic-parser", 0);
+		setKey("bash-use-ps4", 1);
+		setKey("bash-parse-file-dir", StrVecMap_t());
+		setKey("bash-parse-binary-dir", 1);
+		setKey("verify", 0);
+		setKey("command-name", "");
+		setKey("merged-name", "[merged]");
+		setKey("css-file", "");
+		setKey("lldb-use-raw-breakpoint-writes", 0);
+		setKey("system-mode-write-file", "");
+		setKey("system-mode-write-file-mode", 0644);
+		setKey("system-mode-read-results-file", "");
+		setKey("patchelf-command", "patchelf");
+		setKey("coveralls-service-name", "travis-ci");
+	}
+
+	void setKey(const std::string &key, const std::string &val)
+	{
+		m_strings[key] = val;
+
+		notifyKeyListeners(key);
+	}
+
+	void setKey(const std::string &key, int val)
+	{
+		m_ints[key] = val;
+
+		notifyKeyListeners(key);
+	}
+
+	void setKey(const std::string &key, const std::vector<std::string> &val)
+	{
+		m_stringVectors[key] = val;
+
+		notifyKeyListeners(key);
+	}
+
+	void notifyKeyListeners(const std::string &key)
+	{
+		ListenerMap_t::iterator it = m_listeners.find(key);
+
+		if (it == m_listeners.end())
+			return;
+
+		// The callback should re-read the configuration item
+		it->second->onConfigurationChanged(key);
+	}
+
+	void configure(const std::string &key, const std::string &value)
+	{
+		if (key == "low-limit" || key == "high-limit"
+				|| key == "bash-use-basic-parser")
+		{
+			if (!isInteger(value))
+				panic("Value for %s must be integer\n", key.c_str());
+		}
+
+		if (key == "low-limit")
+			setKey(key, stoul(std::string(value)));
+		else if (key == "high-limit")
+			setKey(key, stoul(std::string(value)));
+		else if (key == "system-mode-write-file")
+			setKey(key, std::string(value));
+		else if (key == "system-mode-read-results-file")
+			setKey(key, stoul(std::string(value)));
+		else if (key == "bash-use-basic-parser")
+			setKey(key, stoul(std::string(value)));
+		else if (key == "lldb-use-raw-breakpoint-writes")
+			setKey(key, stoul(std::string(value)));
+		else if (key == "command-name")
+			setKey(key, std::string(value));
+		else if (key == "css-file")
+			setKey(key, std::string(value));
+		else if (key == "merged-name")
+			setKey(key, std::string(value));
+		else if (key == "coveralls-service-name")
+			setKey(key, std::string(value));
+		else
+			panic("Unknown key %s\n", key.c_str());
+	}
+
+	const char *getConfigurableValues()
+	{
+		return "                           bash-use-basic-parser=1    Enable simple bash parser\n"
+				"                           command-name=STR           Name of executed command\n"
+				"                           css-file=FILE              Filename of bcov.css file\n"
+				"                           high-limit=NUM             Percentage for high coverage\n"
+				"                           low-limit=NUM              Percentage for low coverage\n"
+				"                           merged-name=STR            Name of [merged] tag in HTML\n"
+				"                           coveralls-service-name=STR Service name for coveralls\n";
+	}
+
+	std::string uncommonOptions()
+	{
+		if (!m_printUncommon)
+			return " --uncommon-options      print uncommon options for --help\n";
+
+		return fmt(
+				" --replace-src-path=path replace the string found before the : with the string \n"
+						"                         found after the :\n"
+						" --path-strip-level=num  path levels to show for common paths (default: %d)\n"
+						"\n"
+						" --gcov                  use gcov parser instead of DWARF debugging info\n"
+						" --clang                 use Clang Sanitizer-coverage parser\n"
+						" --system-record         perform full-system instrumentation\n"
+						" --system-report         report full-system coverage data\n"
+						" --skip-solibs           don't parse shared libraries (default: parse solibs)\n"
+						" --exit-first-process    exit when the first process exits, i.e., honor the\n"
+						"                         behavior of daemons (default: wait until last)\n"
+						" --output-interval=ms    Interval to produce output in milliseconds (0 to\n"
+						"                         only output when kcov terminates, default %d)\n"
+						"\n"
+						" --debug=X               set kcov debugging level (max 31, default 0)\n"
+						"\n"
+						" --configure=key=value,... Manually set configuration values. Possible values:\n"
+						"%s"
+						"\n"
+						" --verify                verify breakpoint setup (to catch compiler bugs)\n"
+						"\n"
+						" --python-parser=cmd     Python parser to use (for python script coverage),\n"
+						"                         default: %s\n"
+						" --bash-parser=cmd       Bash parser to use (for bash/sh script coverage),\n"
+						"                         default: %s\n"
+						" --patchelf=cmd          patchelf binary to use (for system mode),\n"
+						"                         default: %s\n"
+						" --bash-method=method    Bash coverage collection method, PS4 (default) or DEBUG\n"
+						" --bash-handle-sh-invocation  Try to handle #!/bin/sh scripts by a LD_PRELOAD\n"
+						"                         execve replacement. Buggy on some systems\n"
+						" --bash-dont-parse-binary-dir Don't parse the binary directory for other scripts\n"
+						" --bash-parse-files-in-dir=dir[,...]  Parse bash scripts in dir(s)\n",
+				keyAsInt("path-strip-level"), keyAsInt("output-interval"),
+				getConfigurableValues(), keyAsString("python-command").c_str(),
+				keyAsString("bash-command").c_str(),
+				keyAsString("patchelf-command").c_str());
+	}
+
+	bool isInteger(std::string str)
+	{
+		size_t pos;
+
+		try
+		{
+			stoul(str, &pos);
+		} catch (std::invalid_argument &e)
+		{
+			return false;
+		}
+
+		return pos == str.size();
+	}
+
+	void expandPath(StrVecMap_t &paths)
+	{
+		for (StrVecMap_t::iterator it = paths.begin(); it != paths.end(); ++it)
+		{
+			std::string &s = *it;
+
+			if (s[0] == '~')
+				s = get_home() + s.substr(1, s.size());
+			*it = s;
+		}
+	}
+
+	StrVecMap_t getCommaSeparatedList(std::string str)
+	{
+		StrVecMap_t out;
+
+		if (str.find(',') == std::string::npos)
+		{
+			out.push_back(str);
+			return out;
+		}
+
+		size_t pos, lastPos;
+
+		lastPos = 0;
+		for (pos = str.find_first_of(","); pos != std::string::npos;
+				pos = str.find_first_of(",", pos + 1))
+		{
+			std::string cur = str.substr(lastPos, pos - lastPos);
+
+			out.push_back(cur);
+			lastPos = pos + 1;
+		}
+		out.push_back(str.substr(lastPos, str.size() - lastPos));
+
+		return out;
+	}
+
+	StringKeyMap_t m_strings;
+	IntKeyMap_t m_ints;
+	StrVecKeyMap_t m_stringVectors;
+
+	const char **m_programArgs;
+	unsigned int m_argc;
+	bool m_printUncommon;
+
+	ListenerMap_t m_listeners;
+};
+
+IConfiguration & IConfiguration::getInstance()
+{
+	static Configuration *g_instance;
+
+	if (!g_instance)
+		g_instance = new Configuration();
+
+	return *g_instance;
+}
diff --git a/kcov-38/src/dummy-solib-handler.cc b/kcov-38/src/dummy-solib-handler.cc
new file mode 100644
index 000000000000..203d1489085c
--- /dev/null
+++ b/kcov-38/src/dummy-solib-handler.cc
@@ -0,0 +1,20 @@
+#include <solib-handler.hh>
+
+using namespace kcov;
+
+class DummySolibHandler : public ISolibHandler
+{
+public:
+	virtual void startup()
+	{
+	}
+};
+
+void kcov::blockUntilSolibDataRead()
+{
+}
+
+ISolibHandler &kcov::createSolibHandler(IFileParser &parser, ICollector &collector)
+{
+	return *new DummySolibHandler();
+}
diff --git a/kcov-38/src/engine-factory.cc b/kcov-38/src/engine-factory.cc
new file mode 100644
index 000000000000..4197493f45b3
--- /dev/null
+++ b/kcov-38/src/engine-factory.cc
@@ -0,0 +1,63 @@
+#include <engine.hh>
+#include <utils.hh>
+
+#include <vector>
+
+using namespace kcov;
+
+class EngineFactory: public IEngineFactory
+{
+public:
+	EngineFactory()
+	{
+	}
+
+	void registerEngine(IEngineCreator &engine)
+	{
+		m_engines.push_back(&engine);
+	}
+
+	IEngineCreator &matchEngine(const std::string &fileName)
+	{
+		IEngineCreator *best = NULL;
+		size_t sz;
+
+		uint8_t *data = (uint8_t *) peek_file(&sz, "%s", fileName.c_str());
+
+		for (EngineList_t::iterator it = m_engines.begin();
+				it != m_engines.end(); ++it)
+		{
+			if (!best)
+				best = *it;
+
+			if ((*it)->matchFile(fileName, data, sz)
+					> best->matchFile(fileName, data, sz))
+				best = *it;
+		}
+		free((void *) data);
+
+		if (!best)
+			panic("No engines registered");
+
+		return *best;
+	}
+
+private:
+	typedef std::vector<IEngineCreator *> EngineList_t;
+
+	EngineList_t m_engines;
+};
+
+IEngineFactory::IEngineCreator::IEngineCreator()
+{
+	IEngineFactory::getInstance().registerEngine(*this);
+}
+
+static EngineFactory *g_instance;
+IEngineFactory &IEngineFactory::getInstance()
+{
+	if (!g_instance)
+		g_instance = new EngineFactory();
+
+	return *g_instance;
+}
diff --git a/kcov-38/src/engines/bash-engine.cc b/kcov-38/src/engines/bash-engine.cc
new file mode 100644
index 000000000000..1df823589de8
--- /dev/null
+++ b/kcov-38/src/engines/bash-engine.cc
@@ -0,0 +1,845 @@
+#define _WITH_GETLINE	// Needed on FreeBSD < 12.0
+#include <file-parser.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <lineid.hh>
+#include <utils.hh>
+#include <generated-data-base.hh>
+#include <source-file-cache.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <signal.h>
+#include <dirent.h>
+#include <stdio.h>
+
+#include <list>
+#include <unordered_map>
+#include <vector>
+#include <algorithm>
+
+#include <swap-endian.hh>
+
+#include "script-engine-base.hh"
+
+using namespace kcov;
+
+extern GeneratedData bash_helper_data;
+extern GeneratedData bash_helper_debug_trap_data;
+extern GeneratedData bash_redirector_library_data;
+
+enum InputType
+{
+	INPUT_NORMAL,       // No multiline stuff
+	INPUT_QUOTE,        // "
+	INPUT_SINGLE_QUOTE, // '
+	INPUT_MULTILINE,    // backslash backslash
+};
+
+class BashEngine : public ScriptEngineBase
+{
+public:
+	BashEngine() :
+			ScriptEngineBase(), m_child(0), m_stderr(NULL), m_stdout(NULL), m_bashSupportsXtraceFd(false),
+			m_inputType(INPUT_NORMAL)
+	{
+	}
+
+	~BashEngine()
+	{
+		kill(SIGTERM);
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		int stderrPipe[2];
+		int stdoutPipe[2];
+
+		if (pipe(stderrPipe) < 0)
+		{
+			error("Failed to open pipe");
+
+			return false;
+		}
+
+		if (pipe(stdoutPipe) < 0)
+		{
+			error("Failed to open pipe");
+			close(stderrPipe[0]);
+			close(stderrPipe[1]);
+
+			return false;
+		}
+
+		m_bashSupportsXtraceFd = bashCanHandleXtraceFd();
+
+		std::string helperPath = IOutputHandler::getInstance().getBaseDirectory() + "bash-helper.sh";
+		std::string helperDebugTrapPath = IOutputHandler::getInstance().getBaseDirectory() + "bash-helper-debug-trap.sh";
+		std::string redirectorPath = IOutputHandler::getInstance().getBaseDirectory() + "libbash_execve_redirector.so";
+
+		if (write_file(bash_helper_data.data(), bash_helper_data.size(), "%s", helperPath.c_str()) < 0)
+		{
+			error("Can't write helper");
+
+			return false;
+		}
+		if (write_file(bash_helper_debug_trap_data.data(), bash_helper_debug_trap_data.size(), "%s",
+				helperDebugTrapPath.c_str()) < 0)
+		{
+			error("Can't write helper");
+
+			return false;
+		}
+		if (write_file(bash_redirector_library_data.data(), bash_redirector_library_data.size(), "%s",
+				redirectorPath.c_str()) < 0)
+		{
+			error("Can't write redirector library at %s", redirectorPath.c_str());
+
+			return false;
+		}
+
+		m_listener = &listener;
+
+		/* Launch child */
+		m_child = fork();
+		if (m_child > 0)
+		{
+
+			// Close the parents write end of the pipe
+			close(stderrPipe[1]);
+			close(stdoutPipe[1]);
+
+			// And open a FILE * to stderr
+			m_stderr = fdopen(stderrPipe[0], "r");
+			if (!m_stderr)
+			{
+				error("Can't reopen the stderr pipe");
+				return false;
+			}
+			m_stdout = fdopen(stdoutPipe[0], "r");
+			if (!m_stdout)
+			{
+				error("Can't reopen the stdout pipe");
+				fclose(m_stderr);
+
+				return false;
+			}
+
+		}
+		else if (m_child == 0)
+		{
+			const char **argv = conf.getArgv();
+			unsigned int argc = conf.getArgc();
+			int xtraceFd = 782; // Typical bash users use 3,4 etc but not high fd numbers (?)
+			{
+				// However, the range of fd numbers that this process can use is limited by the caller of this process.
+				// The following code specification will require discussion with many kcov users.
+				struct rlimit rlim;
+				if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
+					perror("Failed to get the maximum number of open file descriptors.");
+					return false;
+				}
+				xtraceFd = rlim.rlim_cur / 4;
+			}
+			const std::string command = conf.keyAsString("bash-command");
+			bool usePS4 = conf.keyAsInt("bash-use-ps4");
+
+			// Revert to stderr if this bash version can't handle BASH_XTRACE
+			if (usePS4 && !m_bashSupportsXtraceFd)
+				xtraceFd = 2;
+
+			if (dup2(stderrPipe[1], xtraceFd) < 0)
+			{
+				perror("Failed to exchange stderr for pipe");
+				return false;
+			}
+			if (dup2(stdoutPipe[1], 1) < 0)
+			{
+				perror("Failed to exchange stderr for pipe");
+				return false;
+			}
+
+			/* Close the childs old write end of the pipe */
+			close(stderrPipe[1]);
+			close(stdoutPipe[1]);
+
+			/* Close the childs read end of the pipe */
+			close(stderrPipe[0]);
+			close(stdoutPipe[0]);
+
+			doSetenv(fmt("KCOV_BASH_XTRACEFD=%d", xtraceFd));
+			// Export the bash command for use in the bash-execve-redirector library
+			doSetenv(fmt("KCOV_BASH_COMMAND=%s", command.c_str()));
+
+			/* Set up PS4 for tracing */
+			if (usePS4)
+			{
+				doSetenv(fmt("BASH_ENV=%s", helperPath.c_str()));
+				doSetenv(fmt("BASH_XTRACEFD=%d", xtraceFd));
+				doSetenv("PS4=kcov@${BASH_SOURCE}@${LINENO}@");
+			}
+			else
+			{
+				// Use DEBUG trap
+				doSetenv(fmt("BASH_ENV=%s", helperDebugTrapPath.c_str()));
+				doSetenv(fmt("KCOV_BASH_USE_DEBUG_TRAP=1"));
+			}
+
+			// And preload it!
+			if (conf.keyAsInt("bash-handle-sh-invocation"))
+				doSetenv(std::string("LD_PRELOAD=" + redirectorPath));
+
+			// Make a copy of the vector, now with "bash -x" first
+			char **vec;
+			int argcStart = usePS4 ? 2 : 1;
+			vec = (char **) xmalloc(sizeof(char *) * (argc + 3));
+			vec[0] = xstrdup(conf.keyAsString("bash-command").c_str());
+
+			if (usePS4)
+				vec[1] = xstrdup("-x");
+			for (unsigned i = 0; i < argc; i++)
+				vec[argcStart + i] = xstrdup(argv[i]);
+
+			/* Execute the script */
+			if (execv(vec[0], vec))
+			{
+				perror("Failed to execute script");
+
+				free(vec);
+
+				return false;
+			}
+		}
+		else if (m_child < 0)
+		{
+			perror("fork");
+
+			return false;
+		}
+
+		std::vector<std::string> dirsToParse = conf.keyAsList("bash-parse-file-dir");
+
+		for (std::vector<std::string>::iterator it = dirsToParse.begin(); it != dirsToParse.end(); ++it)
+		{
+			parseDirectoryForFiles(*it);
+		}
+
+		// Parse the directory where the script-under-test is for other bash scripts
+		if (conf.keyAsInt("bash-parse-binary-dir"))
+		{
+			parseDirectoryForFiles(conf.keyAsString("binary-path"));
+		}
+		parseFile(executable);
+
+		return true;
+	}
+
+	bool checkEvents()
+	{
+		char *curLine = NULL;
+		ssize_t len;
+		size_t linecap = 0;
+
+		// First printout any collected stdout data
+		handleStdout();
+
+		len = getline(&curLine, &linecap, m_stderr);
+		if (len < 0)
+			return false;
+
+		std::string cur(curLine);
+		// Line markers always start with kcov@
+
+		if (m_inputType == INPUT_SINGLE_QUOTE) {
+			m_inputType = getInputType(cur);
+			return true;
+		}
+
+		size_t kcovStr = cur.find("kcov@");
+		if (kcovStr == std::string::npos)
+		{
+			fprintf(stderr, "%s", cur.c_str());
+			return true;
+		}
+		m_inputType = getInputType(cur);
+
+		std::vector<std::string> parts = split_string(cur.substr(kcovStr), "@");
+
+		// kcov@FILENAME@LINENO@...
+		if (parts.size() < 3)
+			return true;
+
+		// Resolve filename (might be relative)
+		const std::string &filename = get_real_path(parts[1]);
+		const std::string &lineNo = parts[2];
+
+		// Skip the helper libraries
+		if (filename.find("bash-helper.sh") != std::string::npos)
+			return true;
+		if (filename.find("bash-helper-debug-trap.sh") != std::string::npos)
+			return true;
+
+		if (!string_is_integer(lineNo))
+		{
+			error("%s is not an integer", lineNo.c_str());
+
+			return false;
+		}
+
+		if (!m_reportedFiles[filename])
+		{
+			m_reportedFiles[filename] = true;
+
+			for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
+				(*it)->onFile(File(filename, IFileParser::FLG_NONE));
+
+			parseFile(filename);
+		}
+
+		if (m_listener)
+		{
+			uint64_t address = 0;
+			Event ev;
+
+			LineIdToAddressMap_t::iterator it = m_lineIdToAddress.find(getLineId(filename, string_to_integer(lineNo)));
+			if (it != m_lineIdToAddress.end())
+				address = it->second;
+
+			ev.type = ev_breakpoint;
+			ev.addr = address;
+			ev.data = 1;
+
+			m_listener->onEvent(ev);
+		}
+
+		return true;
+	}
+
+	bool continueExecution()
+	{
+		if (checkEvents())
+			return true;
+
+		// Otherwise wait for child
+		int status;
+		int rv;
+
+		rv = waitpid(m_child, &status, WNOHANG);
+		if (rv != m_child)
+		{
+			return true;
+		}
+		else
+		{
+			// Child exited, let's make sure that we have all the events/stdout.
+			checkEvents();
+		}
+
+		if (WIFEXITED(status))
+		{
+			reportEvent(ev_exit_first_process, WEXITSTATUS(status));
+		}
+		else
+		{
+			warning("Other status: 0x%x\n", status);
+			reportEvent(ev_error, -1);
+		}
+
+		return false;
+	}
+
+	void kill(int signal)
+	{
+		if (m_child == 0)
+			return;
+
+		::kill(m_child, signal);
+	}
+
+	std::string getParserType()
+	{
+		return "bash";
+	}
+
+	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		std::string s((const char *) data, 80);
+
+		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".sh")
+			return 200;
+
+		if (s.find("#!/bin/bash") != std::string::npos)
+			return 400;
+		if (s.find("#!/bin/sh") != std::string::npos)
+			return 300;
+		if (s.find("bash") != std::string::npos)
+			return 100;
+		if (s.find("sh") != std::string::npos)
+			return 50;
+
+		return match_none;
+	}
+
+private:
+	void parseDirectoryForFiles(const std::string &base)
+	{
+		DIR *dir = ::opendir(base.c_str());
+		if (!dir)
+		{
+			error("Can't open directory %s\n", base.c_str());
+			return;
+		}
+
+		// Loop through the directory structure
+		struct dirent *de;
+		for (de = ::readdir(dir); de; de = ::readdir(dir))
+		{
+			std::string cur = base + "/" + de->d_name;
+
+			if (strcmp(de->d_name, ".") == 0)
+				continue;
+
+			if (strcmp(de->d_name, "..") == 0)
+				continue;
+
+			struct stat st;
+
+			if (lstat(cur.c_str(), &st) < 0)
+				continue;
+
+			if (S_ISDIR(st.st_mode))
+			{
+				parseDirectoryForFiles(cur);
+			}
+			else
+			{
+				size_t sz;
+				uint8_t *p = (uint8_t *) read_file(&sz, "%s", cur.c_str());
+
+				if (p)
+				{
+					// Bash file?
+					if (matchParser(cur, p, sz) != match_none)
+					{
+						parseFile(cur);
+					}
+
+				}
+				free((void *) p);
+			}
+		}
+		::closedir(dir);
+	}
+
+	// Printout lines to stdout, except kcov markers
+	void handleStdout()
+	{
+		// No need if we have xtrace fd support
+		if (m_bashSupportsXtraceFd)
+		{
+			return;
+		}
+
+		char *curLine = NULL;
+		size_t linecap = 0;
+
+		while (file_readable(m_stdout, 0) && getline(&curLine, &linecap, m_stdout) > 0)
+		{
+			/* Check for line markers to filter these away.
+			 *
+			 * For some reason, redirection sometimes give kkcov@..., so filter that
+			 * in addition to the obvious stuff
+			 */
+			size_t kcovMarker = std::string(curLine).find("kcov@");
+
+			if (kcovMarker != 0 && kcovMarker != 1)
+			{
+				printf("%s", curLine);
+			}
+		}
+		free(curLine);
+	}
+
+	bool bashCanHandleXtraceFd()
+	{
+		FILE *fp;
+		bool out = false;
+		IConfiguration &conf = IConfiguration::getInstance();
+		std::string cmd = conf.keyAsString("bash-command") + " -c 'echo \"$BASH_VERSION\"'";
+
+		/* Has input via stderr been forced regardless of bash version?
+		 * Basically for testing only
+		 */
+		if (conf.keyAsInt("bash-force-stderr-input"))
+			return false;
+
+		fp = popen(cmd.c_str(), "r");
+		if (!fp)
+			return false;
+
+		int major = 0;
+		int minor = 0;
+
+		// Read the first line
+		if (fscanf(fp, "%d.%d", &major, &minor) != EOF) {
+			// Bash 4.2 and above supports BASH_XTRACEFD
+			if (major > 4 || (major == 4 && minor >= 2))
+				out = true;
+		}
+
+		pclose(fp);
+
+		return out;
+	}
+
+	enum InputType getInputType(const std::string &str)
+	{
+		enum InputType out = m_inputType;
+
+		for(std::string::size_type i = 0; i < str.size(); ++i) {
+			if (str[i] == '\\' && out == INPUT_NORMAL)
+				i++;
+			else if (str[i] == '\'')
+				out = (out == INPUT_NORMAL ? INPUT_SINGLE_QUOTE : INPUT_NORMAL);
+		}
+
+		return out;
+	}
+
+	void doSetenv(const std::string &val)
+	{
+		// "Leak" some bytes, but the environment needs that
+		char *envString = (char *) xmalloc(val.size() + 1);
+
+		strcpy(envString, val.c_str());
+
+		putenv(envString);
+	}
+
+	// Sweep through lines in a file to determine what is valid code
+	void parseFile(const std::string &filename)
+	{
+		if (!m_listener)
+			return;
+		ISourceFileCache &cache = ISourceFileCache::getInstance();
+
+		std::vector<std::string> lines = cache.getLines(filename);
+
+		// Compute hash for this file
+		uint32_t crc = cache.getCrc(filename);
+
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		if (conf.keyAsInt("bash-use-basic-parser"))
+			parseFileBasic(filename, lines, crc);
+		else
+			parseFileFull(filename, lines, crc);
+	}
+
+	void parseFileBasic(const std::string &filename, const std::vector<std::string> &lines, uint32_t crc)
+	{
+		unsigned int lineNo = 0;
+
+		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
+		{
+			std::string s = trim_string(*it);
+
+			lineNo++;
+
+			kcov_debug(ENGINE_MSG, "bash_line %2d: %s\n", lineNo, s.c_str());
+
+			// Remove comments
+			size_t comment = s.find("#");
+			if (comment != std::string::npos)
+			{
+
+				// But not $# or ${#variable}...
+				if ((comment >= 1 && s[comment - 1] == '$')
+						|| (comment >= 2 && s.rfind("${", comment) != std::string::npos
+								&& s.find("}", comment) != std::string::npos))
+				{
+					// Do nothing
+					// Nor if in a string
+				}
+				else if (comment >= 1 && (s.find("\"") < comment || s.find("'") < comment))
+				{
+					// Do nothing
+				}
+				else
+				{
+					s = trim_string(s);
+					s = s.substr(0, comment);
+				}
+			}
+
+			// Empty line, ignore
+			if (s == "")
+				continue;
+
+			// While, if, switch endings
+			if (s == "esac" || s == "fi" || s == "do" || s == "done" || s == "else" || s == "then" || s == "}" || s == "{")
+				continue;
+
+			// Functions
+			if (s.find("function") == 0)
+				continue;
+
+			fileLineFound(crc, filename, lineNo);
+		}
+	}
+
+	void parseFileFull(const std::string &filename, const std::vector<std::string> &lines, uint32_t crc)
+	{
+		unsigned int lineNo = 0;
+		enum
+		{
+			none, backslash, quote, heredoc
+		} state = none;
+		bool caseActive = false;
+		bool arithmeticActive = false;
+		std::string heredocMarker;
+
+		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
+		{
+			std::string s = trim_string(*it);
+
+			lineNo++;
+
+			kcov_debug(ENGINE_MSG, "bash_line %2d: %s\n", lineNo, s.c_str());
+
+			// Remove comments
+			size_t comment = s.find("#");
+			if (comment != std::string::npos)
+			{
+
+				// But not $# or ${#variable}...
+				if ((comment >= 1 && s[comment - 1] == '$')
+						|| (comment >= 2 && s.rfind("${", comment) != std::string::npos
+								&& s.find("}", comment) != std::string::npos))
+				{
+					// Do nothing
+					// Nor if in a string
+				}
+				else if (comment >= 1 && (s.find("\"") < comment || s.find("'") < comment))
+				{
+					// Do nothing
+				}
+				else
+				{
+					s = trim_string(s);
+					s = s.substr(0, comment);
+				}
+			}
+
+			// Empty line, ignore
+			if (s == "")
+				continue;
+
+			if (s.size() >= 2 && s[0] == ';' && s[1] == ';')
+				continue;
+
+			// Empty braces
+			if ((s[0] == '{' || s[0] == '}') && s.size() == 1)
+				continue;
+
+			// While, if, switch endings
+			if (s == "esac" || s == "fi" || s == "do" || s == "done" || s == "else" || s == "then")
+				continue;
+
+			// Functions
+			if (s.find("function") == 0)
+				continue;
+
+			// fn() { .... Yes, regexes would have been better
+			size_t fnPos = s.find("()");
+			if (fnPos != std::string::npos)
+			{
+				// Trim valid last spaces between function name and parenthesis
+				while (fnPos > 1 && ' ' == s[fnPos - 1])
+				{
+					--fnPos;
+				}
+
+				std::string substr = s.substr(0, fnPos);
+
+				// Should be a single word (the function name)
+				if (substr.find(" ") == std::string::npos)
+					continue;
+			}
+
+			// Handle backslashes - only the first line is code
+			if (state == backslash)
+			{
+				if (s[s.size() - 1] != '\\')
+					state = none;
+				continue;
+			}
+
+			// Multi-line quote - only the last line is code
+			if (state == quote)
+			{
+				if (s.find('"') == s.size() - 1) // String ends with "
+					state = none;
+				else
+					continue;
+			}
+
+			// HERE documents
+			if (state == heredoc)
+			{
+				std::string trimmed = trim_string(s, " \t\r\n`");
+
+				if (trimmed == heredocMarker)
+					state = none;
+				continue;
+			}
+
+			if (s.find("$((") != std::string::npos || s.find("$[") != std::string::npos)
+				arithmeticActive = true;
+
+			if (s[s.size() - 1] == '\\')
+			{
+				state = backslash;
+			}
+			else if ((s.find("=\"") != std::string::npos || // Handle multi-line string assignments
+					s.find("= \"") != std::string::npos) && std::count(s.begin(), s.end(), '"') == 1)
+			{
+				state = quote;
+				continue;
+			}
+			else
+			{
+				size_t heredocStart = s.find("<<");
+
+				if (!arithmeticActive && s.find("let ") != 0 && s.find("$((") == std::string::npos
+						&& s.find("))") == std::string::npos && heredocStart != std::string::npos)
+				{
+					// Skip << and remove spaces before and after "EOF"
+					heredocMarker = trim_string(s.substr(heredocStart + 2, s.size()));
+
+					// Make sure the heredoc marker is a word
+					for (unsigned int i = 0; i < heredocMarker.size(); i++)
+					{
+						if (heredocMarker[i] == ' ' || heredocMarker[i] == '\t')
+						{
+							heredocMarker = heredocMarker.substr(0, i);
+							break;
+						}
+					}
+
+					if (heredocMarker[0] == '-')
+					{
+						// '-' marks tab-suppression in heredoc
+						heredocMarker = heredocMarker.substr(1);
+					}
+
+					if (heredocMarker.length() > 2 && (heredocMarker[0] == '"' || heredocMarker[0] == '\'')
+							&& heredocMarker[0] == heredocMarker[heredocMarker.length() - 1])
+					{
+						// remove enclosing in quotes
+						heredocMarker = heredocMarker.substr(1, heredocMarker.length() - 2);
+					}
+
+					if (heredocMarker.size() > 0 && heredocMarker[0] != '<')
+						state = heredoc;
+
+					std::string beforeHeredoc = trim_string(s.substr(0, heredocStart));
+					/*
+					 * Special case for things like
+					 * while read -r line ; do
+					 *     echo $line
+					 * done <<EOF
+					 * xxx
+					 * yyy
+					 * EOF
+					 *
+					 * where the done statement is nocode (as above)
+					 */
+					if (beforeHeredoc == "done")
+						continue;
+				}
+			}
+
+			if (s.find("case") == 0)
+				caseActive = true;
+			else if (s.find("esac") == 0)
+				caseActive = false;
+
+			if (s.find("))") != std::string::npos || s.find("]") != std::string::npos)
+				arithmeticActive = false;
+
+			// Only the last line of arithmetic is code
+			if (arithmeticActive)
+				continue;
+
+			// Case switches are nocode
+			if (caseActive && s[s.size() - 1] == ')')
+			{
+				// But let functions be (albeit not with balanced parentheses)
+				size_t startParenthesis = s.find("(");
+				if (startParenthesis == std::string::npos || startParenthesis == 0)
+					continue;
+			}
+
+			fileLineFound(crc, filename, lineNo);
+		}
+	}
+
+	pid_t m_child;
+	FILE *m_stderr;
+	FILE *m_stdout;
+	bool m_bashSupportsXtraceFd;
+	enum InputType m_inputType;
+};
+
+// This ugly stuff should be fixed
+static BashEngine *g_bashEngine;
+class BashCtor
+{
+public:
+	BashCtor()
+	{
+		g_bashEngine = new BashEngine();
+	}
+};
+static BashCtor g_bashCtor;
+
+class BashEngineCreator: public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~BashEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return g_bashEngine;
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		std::string s((const char *) data, 80);
+
+		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".sh")
+			return 200;
+
+		if (s.find("#!/bin/bash") != std::string::npos)
+			return 400;
+		if (s.find("#!/bin/sh") != std::string::npos)
+			return 300;
+		if (s.find("bash") != std::string::npos)
+			return 100;
+		if (s.find("sh") != std::string::npos)
+			return 50;
+
+		return match_none;
+	}
+};
+
+static BashEngineCreator g_bashEngineCreator;
diff --git a/kcov-38/src/engines/bash-execve-redirector.c b/kcov-38/src/engines/bash-execve-redirector.c
new file mode 100644
index 000000000000..8a2b444b9ea1
--- /dev/null
+++ b/kcov-38/src/engines/bash-execve-redirector.c
@@ -0,0 +1,87 @@
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <dlfcn.h>
+
+// Peek the first few bytes of a file (i.e., #!/bin/sh etc)
+static int peek_file(const char *filename, char *buf, int bufSize)
+{
+	FILE *fp = fopen(filename, "r");
+	int rv;
+
+	if (!fp)
+		return -1;
+
+	rv = fread(buf, 1, bufSize, fp);
+
+	fclose(fp);
+
+	return rv;
+}
+
+static char *kcovBash;
+static int kcovUseDebugTrap;
+
+static int (*orig_execve)(const char *filename, char * const argv[], char * const envp[]);
+int execve(const char *filename, char * const argv[], char * const envp[])
+{
+	char startBytes[128];
+	int sizeRead;
+	const char bashArg[3] =
+	{ '-', 'x', '\0' };
+
+	if (!orig_execve)
+		orig_execve = dlsym(RTLD_NEXT, "execve");
+
+	sizeRead = peek_file(filename, startBytes, sizeof(startBytes));
+
+	// Make sure it's NULL-terminated
+	startBytes[sizeof(startBytes) - 1] = '\0';
+	if (sizeRead >= 0)
+		startBytes[sizeRead] = '\0';
+
+	// Shell script being executed?
+	if (kcovBash && sizeRead >= 6
+			&& (strstr(startBytes, "/bin/sh") != NULL || strstr(startBytes, "/bin/bash") != NULL
+					|| strstr(startBytes, "/bin/ash") != NULL || strstr(startBytes, "/bin/dash") != NULL ))
+	{
+		char **replacementArgv;
+		unsigned i = 0;
+
+		// Find end
+		for (i = 0; argv[i]; i++)
+			;
+
+		unsigned arg = 0;
+
+		replacementArgv = malloc(sizeof(char*) * (i + 4));
+		replacementArgv[arg++] = strdup(kcovBash);
+		if (!kcovUseDebugTrap)
+			replacementArgv[arg++] = strdup(bashArg);
+		replacementArgv[arg++] = strdup(filename);
+		for (i = 0; argv[i]; i++)
+			replacementArgv[i + arg] = strdup(argv[i]);
+		replacementArgv[i + arg] = NULL;
+
+		filename = strdup(kcovBash);
+
+		argv = replacementArgv;
+	}
+
+	return orig_execve(filename, argv, envp);
+}
+
+void __attribute__((constructor)) kcov_bash_execve_at_startup(void)
+{
+	kcovBash = getenv("KCOV_BASH_COMMAND");
+	if (getenv("KCOV_BASH_USE_DEBUG_TRAP"))
+		kcovUseDebugTrap = 1;
+}
diff --git a/kcov-38/src/engines/bash-helper-debug-trap.sh b/kcov-38/src/engines/bash-helper-debug-trap.sh
new file mode 100755
index 000000000000..6a1d12e7ca54
--- /dev/null
+++ b/kcov-38/src/engines/bash-helper-debug-trap.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -o functrace
+trap 'echo "kcov@${BASH_SOURCE}@${LINENO}@" >&$KCOV_BASH_XTRACEFD' DEBUG
+unset BASH_ENV
diff --git a/kcov-38/src/engines/bash-helper.sh b/kcov-38/src/engines/bash-helper.sh
new file mode 100644
index 000000000000..900e2e9b59fa
--- /dev/null
+++ b/kcov-38/src/engines/bash-helper.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Turn on tracing
+set -x
diff --git a/kcov-38/src/engines/clang-coverage-engine.cc b/kcov-38/src/engines/clang-coverage-engine.cc
new file mode 100644
index 000000000000..66bad9e2e759
--- /dev/null
+++ b/kcov-38/src/engines/clang-coverage-engine.cc
@@ -0,0 +1,268 @@
+#include <engine.hh>
+#include <utils.hh>
+#include <configuration.hh>
+#include <capabilities.hh>
+#include <file-parser.hh>
+#include <disassembler.hh>
+#include <elf.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <signal.h>
+
+#include <vector>
+#include <unordered_map>
+#include <utility> // std::pair
+
+#include "../parsers/dwarf.hh"
+#include "script-engine-base.hh"
+
+using namespace kcov;
+
+class ClangEngine : public ScriptEngineBase, IFileParser::ILineListener
+{
+public:
+	ClangEngine() :
+			ScriptEngineBase(), m_child(-1), m_checksum(0)
+	{
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		char * const *argv = (char * const *) conf.getArgv();
+
+		m_listener = &listener;
+
+		// Run the program until completion
+		m_child = fork();
+		if (m_child == 0)
+		{
+			std::string env = fmt("ASAN_OPTIONS=coverage=1:coverage_dir=%s", conf.keyAsString("target-directory").c_str());
+
+			char *cpy = xstrdup(env.c_str());
+
+			putenv(cpy);
+			unsetenv("LD_PRELOAD");
+			execv(argv[0], argv);
+		}
+		else if (m_child < 0)
+		{
+			perror("fork");
+
+			return false;
+		}
+
+		return true;
+	}
+
+	bool continueExecution()
+	{
+		if (m_child < 0)
+			return false;
+
+		int status = 0;
+
+		// Wait for the child
+		waitpid(m_child, &status, 0);
+
+		m_child = -1;
+
+		// All coverage collection is done after the program has been run
+		DIR *dir;
+		struct dirent *de;
+
+		std::string targetDir = IConfiguration::getInstance().keyAsString("target-directory");
+		dir = opendir(targetDir.c_str());
+		panic_if(!dir, "Can't open directory\n");
+
+		for (de = readdir(dir); de; de = readdir(dir))
+		{
+			std::string cur = fmt("%s/%s", targetDir.c_str(), de->d_name);
+
+			// ... except for the current coveree
+			if (cur.find(".sancov") == std::string::npos)
+				continue;
+
+			parseCoverageFile(cur);
+		}
+		closedir(dir);
+
+		Event ev(ev_exit, WEXITSTATUS(status));
+
+		// Report the exit status
+		m_listener->onEvent(ev);
+
+		return false;
+	}
+
+	std::string getParserType()
+	{
+		return "clang-sanitizer";
+	}
+
+	virtual uint64_t getChecksum()
+	{
+		return m_checksum;
+	}
+
+	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		if (IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
+			return match_perfect;
+
+		return match_none;
+	}
+
+	virtual enum IFileParser::PossibleHits maxPossibleHits()
+	{
+		return IFileParser::HITS_SINGLE;
+	}
+
+	void kill(int signal)
+	{
+	}
+
+	bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
+	{
+		IElf *elf = IElf::create(filename);
+
+		if (!elf)
+			return false;
+
+		const std::vector<Segment> &segs = elf->getSegments();
+		for (std::vector<Segment>::const_iterator it = segs.begin(); it != segs.end(); ++it)
+			IDisassembler::getInstance().addSection(it->getData(), it->getSize(), it->getBase());
+
+		bool rv = m_dwarfParser.open(filename);
+
+		// Get a list of all possible source lines
+		if (rv)
+			m_dwarfParser.forEachLine(*this);
+
+		size_t sz;
+		uint8_t *p = (uint8_t *) read_file(&sz, "%s", filename.c_str());
+
+		m_checksum = hash_block(p, sz);
+
+		free(p);
+
+		return rv;
+	}
+
+private:
+	typedef std::vector<std::string> FileList_t;
+
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+
+		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
+			(*it)->onLine(get_real_path(file), lineNr, addr);
+	}
+
+	void parseCoverageFile(const std::string &name)
+	{
+		size_t sz;
+		void *p;
+
+		p = read_file(&sz, "%s", name.c_str());
+		if (!p)
+		{
+			return;
+		}
+
+		// Remove the coverage file for the next round
+		unlink(name.c_str());
+
+		// Only header?
+		if (sz < 8)
+		{
+			free(p);
+			return;
+		}
+
+		uint64_t header = *(uint64_t *) p;
+		// Assume native-endianness (?)
+		if (header == 0xC0BFFFFFFFFFFF64ULL)
+		{
+			size_t nEntries = (sz - sizeof(uint64_t)) / sizeof(uint64_t);
+			uint64_t *entries = &((uint64_t *) p)[1];
+
+			for (size_t i = 0; i < nEntries; i++)
+			{
+				m_dwarfParser.forAddress(*this, entries[i] + 1);
+				reportBreakpoint(entries[i] + 1);
+			}
+		}
+		else if (header == 0xC0BFFFFFFFFFFF32ULL)
+		{
+			size_t nEntries = (sz - sizeof(uint64_t)) / sizeof(uint32_t);
+			uint32_t *entries = &((uint32_t *) p)[1];
+
+			for (size_t i = 0; i < nEntries; i++)
+			{
+				m_dwarfParser.forAddress(*this, entries[i] + 1);
+				reportBreakpoint(entries[i] + 1);
+			}
+		}
+
+		free(p);
+	}
+
+	void reportBreakpoint(uint64_t address)
+	{
+		std::vector<uint64_t> bb = IDisassembler::getInstance().getBasicBlock(address);
+
+		for (std::vector<uint64_t>::iterator it = bb.begin(); it != bb.end(); ++it)
+			reportEvent(ev_breakpoint, 0, *it);
+
+		// Fallback in case kcov is broken
+		if (bb.empty())
+		{
+			kcov_debug(ENGINE_MSG, "Address 0x%llx not in a basic block\n", (long long) address);
+			reportEvent(ev_breakpoint, 0, address);
+		}
+	}
+
+	pid_t m_child;
+	DwarfParser m_dwarfParser;
+	uint64_t m_checksum;
+};
+
+static ClangEngine *g_clangEngine;
+class ClangCtor
+{
+public:
+	ClangCtor()
+	{
+		g_clangEngine = new ClangEngine();
+	}
+};
+static ClangCtor g_clangCtor;
+
+class ClangEngineCreator: public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~ClangEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return g_clangEngine;
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		if (IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
+			return match_perfect;
+
+		return match_none;
+	}
+};
+
+static ClangEngineCreator g_clangEngineCreator;
diff --git a/kcov-38/src/engines/gcov-engine.cc b/kcov-38/src/engines/gcov-engine.cc
new file mode 100644
index 000000000000..e2492c8db6cd
--- /dev/null
+++ b/kcov-38/src/engines/gcov-engine.cc
@@ -0,0 +1,205 @@
+#include <engine.hh>
+#include <utils.hh>
+#include <configuration.hh>
+#include <file-parser.hh>
+#include <gcov.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+#include <vector>
+#include <unordered_map>
+#include <utility> // std::pair
+
+using namespace kcov;
+
+class GcovEngine : public IEngine, IFileParser::IFileListener
+{
+public:
+	GcovEngine(IFileParser &parser) :
+			m_listener(NULL), m_child(-1)
+	{
+		parser.registerFileListener(*this);
+	}
+
+	int registerBreakpoint(unsigned long addr)
+	{
+		return 0;
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		char * const *argv = (char * const *) IConfiguration::getInstance().getArgv();
+
+		m_listener = &listener;
+
+		// Run the program until completion
+		m_child = fork();
+		if (m_child == 0)
+		{
+			execv(argv[0], argv);
+		}
+		else if (m_child < 0)
+		{
+			perror("fork");
+
+			return false;
+		}
+
+		return true;
+	}
+
+	void kill(int sig)
+	{
+	}
+
+	bool continueExecution()
+	{
+		if (m_child < 0)
+			return false;
+
+		int status;
+
+		// Wait for the child
+		waitpid(m_child, &status, 0);
+
+		m_child = -1;
+
+		// All coverage collection is done after the program has been run
+		for (FileList_t::const_iterator it = m_gcdaFiles.begin(); it != m_gcdaFiles.end(); ++it)
+		{
+			const std::string &gcda = *it;
+			std::string gcno = gcda;
+
+			size_t sz = gcno.size();
+
+			// .gcda -> .gcno
+			gcno[sz - 2] = 'n';
+			gcno[sz - 1] = 'o';
+
+			// Need a pair
+			if (!file_exists(gcno) || !file_exists(gcda))
+				continue;
+
+			parseGcovFiles(gcno, gcda);
+		}
+
+		Event ev(ev_exit, WEXITSTATUS(status));
+
+		// Report the exit status
+		m_listener->onEvent(ev);
+
+		return false;
+	}
+
+private:
+	typedef std::vector<std::string> FileList_t;
+
+	void parseGcovFiles(const std::string &gcnoFile, const std::string gcdaFile)
+	{
+		size_t sz;
+		void *d = read_file(&sz, "%s", gcnoFile.c_str());
+
+		if (!d)
+			return;
+		GcnoParser gcno((uint8_t *) d, sz);
+
+		void *d2 = read_file(&sz, "%s", gcdaFile.c_str());
+
+		if (!d2)
+			return;
+		GcdaParser gcda((uint8_t *) d2, sz);
+
+		gcno.parse();
+		gcda.parse();
+
+		std::unordered_map<int32_t, GcnoParser::BasicBlockList_t> bbsByNumber;
+
+		const GcnoParser::BasicBlockList_t &bbs = gcno.getBasicBlocks();
+		const GcnoParser::ArcList_t &arcs = gcno.getArcs();
+
+		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
+		{
+			const GcnoParser::BasicBlockMapping &cur = *it;
+
+			bbsByNumber[cur.m_basicBlock].push_back(cur);
+		}
+
+		std::unordered_map<int32_t, unsigned int> counterByFunction;
+		for (GcnoParser::ArcList_t::const_iterator it = arcs.begin(); it != arcs.end(); ++it)
+		{
+			const GcnoParser::Arc &cur = *it;
+
+			int64_t counter = gcda.getCounter(cur.m_function, counterByFunction[cur.m_function]);
+
+			counterByFunction[cur.m_function]++;
+
+			// Not found?
+			if (counter < 0)
+			{
+				warning("Arc %u but no counter\n", counterByFunction[cur.m_function]);
+				continue;
+			}
+
+			// No hit, so ignore
+			if (counter == 0)
+				continue;
+
+			reportBasicBlockHit(bbsByNumber[cur.m_dstBlock], counter);
+			reportBasicBlockHit(bbsByNumber[cur.m_srcBlock], counter);
+		}
+	}
+
+	void reportBasicBlockHit(const GcnoParser::BasicBlockList_t &bbs, int64_t counter)
+	{
+		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
+		{
+			const GcnoParser::BasicBlockMapping &bb = *it;
+
+			uint64_t addr = gcovGetAddress(bb.m_file, bb.m_function, bb.m_basicBlock, bb.m_index);
+			Event ev(ev_breakpoint, counter, addr);
+
+			m_listener->onEvent(ev);
+		}
+	}
+
+	// From IFileParser::IFileListener
+	void onFile(const IFileParser::File &file)
+	{
+		if (!(file.m_flags & IFileParser::FLG_TYPE_COVERAGE_DATA))
+			return;
+
+		m_gcdaFiles.push_back(file.m_filename);
+	}
+
+	FileList_t m_gcdaFiles;
+	IEventListener *m_listener;
+	pid_t m_child;
+};
+
+class GcovEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~GcovEngineCreator()
+	{
+	}
+
+	virtual IEngine *create(IFileParser &parser)
+	{
+		return new GcovEngine(parser);
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		if (!IConfiguration::getInstance().keyAsInt("gcov"))
+			return match_none;
+
+		return match_perfect;
+	}
+};
+
+static GcovEngineCreator g_gcovEngineCreator;
diff --git a/kcov-38/src/engines/kernel-engine.cc b/kcov-38/src/engines/kernel-engine.cc
new file mode 100644
index 000000000000..a0d12136f8cf
--- /dev/null
+++ b/kcov-38/src/engines/kernel-engine.cc
@@ -0,0 +1,189 @@
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <utils.hh>
+#include <zlib.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+#include <list>
+#include <unordered_map>
+
+using namespace kcov;
+
+class KernelEngine : public IEngine
+{
+public:
+	KernelEngine() :
+			m_control(NULL), m_show(NULL), m_listener(NULL)
+	{
+	}
+
+	~KernelEngine()
+	{
+		kill(0);
+	}
+
+	// From IEngine
+	int registerBreakpoint(unsigned long addr)
+	{
+		// Don't register the same BP twice
+		if (m_addresses.find(addr) != m_addresses.end())
+			return 0;
+
+		m_addresses[addr] = true;
+
+		std::string s = fmt("%s0x%llx\n", m_module.c_str(), (unsigned long long) addr);
+
+		kcov_debug(ENGINE_MSG, "KNRL set BP at 0x%llx\n", (unsigned long long) addr);
+		panic_if(!m_control, "Control file not open???");
+
+		fprintf(m_control, "%s", s.c_str());
+		fflush(m_control);
+
+		return 0;
+	}
+
+	void setupAllBreakpoints()
+	{
+	}
+
+	bool clearBreakpoint(const Event &ev)
+	{
+		return true;
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		std::string path = IConfiguration::getInstance().keyAsString("kernel-coverage-path");
+		std::string control = path + "/control";
+		std::string show = path + "/show";
+
+		m_listener = &listener;
+
+		// Open kprobe-coverage files
+		m_control = fopen(control.c_str(), "w");
+		m_show = fopen(show.c_str(), "r");
+
+		if (!m_control || !m_show)
+		{
+			error("Can't open kprobe-coverage files. Is the kprobe-coverage module loaded?");
+
+			kill(0);
+			return false;
+		}
+
+		return true;
+	}
+
+	bool continueExecution()
+	{
+		char buf[256]; // More than enough for one line
+		char *p;
+
+		p = fgets(buf, sizeof(buf) - 1, m_show);
+		if (!p)
+			return false;
+
+		buf[sizeof(buf) - 1] = '\0';
+		buf[strlen(buf) - 1] = '\0'; // Remove the \n
+
+		parseOneLine(buf);
+
+		return true;
+	}
+
+	void kill(int sig)
+	{
+		if (m_control)
+		{
+			fprintf(m_control, "clear\n");
+			fclose(m_control);
+		}
+		if (m_show)
+			fclose(m_show);
+
+		m_control = NULL;
+		m_show = NULL;
+	}
+
+private:
+	void parseOneLine(const std::string &line)
+	{
+		std::string moduleName;
+		std::string addr;
+
+		size_t pos = line.find(":");
+
+		if (pos != std::string::npos)
+		{
+			moduleName = line.substr(0, pos);
+			addr = line.substr(pos + 1);
+		}
+		else
+		{
+			addr = line;
+		}
+
+		// Invalid?
+		if (!string_is_integer(addr, 16))
+			return;
+
+		uint64_t value = string_to_integer(addr, 16);
+
+		kcov_debug(ENGINE_MSG, "KNRL BP at 0x%llx\n", (unsigned long long) value);
+
+		m_listener->onEvent(Event(ev_breakpoint, 0, value));
+	}
+
+	FILE *m_control;
+	FILE *m_show;
+	IEventListener *m_listener;
+
+	std::unordered_map<unsigned long, bool> m_addresses;
+
+	std::string m_module;
+};
+
+class KernelEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~KernelEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return new KernelEngine();
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		if (filename.find("vmlinux") != std::string::npos)
+			return match_perfect;
+
+		if (filename.find(".ko") == std::string::npos)
+			return match_none;
+
+		// Fix this somehow
+#if 0
+		m_module = filename;
+		size_t slashPos = m_module.rfind("/");
+		if (slashPos == std::string::npos)
+		slashPos = 0;
+		else
+		slashPos++; // Skip the actual slash
+
+		// Remove path before and .ko after the name
+		m_module = m_module.substr(slashPos, m_module.size() - slashPos - 3) + ":";
+#endif
+
+		return match_perfect;
+	}
+};
+static KernelEngineCreator g_kernelEngineCreator;
diff --git a/kcov-38/src/engines/lldb-engine.cc b/kcov-38/src/engines/lldb-engine.cc
new file mode 100644
index 000000000000..ab5c924f4a03
--- /dev/null
+++ b/kcov-38/src/engines/lldb-engine.cc
@@ -0,0 +1,486 @@
+#include <file-parser.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <filter.hh>
+#include <utils.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/param.h>
+#include <signal.h>
+
+#include <list>
+#include <unordered_map>
+#include <vector>
+
+#include <lldb/API/LLDB.h>
+#include <lldb/API/SBUnixSignals.h>
+
+using namespace kcov;
+using namespace lldb;
+
+extern char **environ;
+
+class LLDBEngine : public IEngine, public IFileParser
+{
+public:
+	LLDBEngine() :
+		m_listener(NULL),
+		m_useLLDBBreakpoints(true),
+		m_filter(NULL)
+	{
+		SBDebugger::Initialize();
+		m_debugger = SBDebugger::Create();
+
+		m_debugger.SetAsync(false);
+		IParserManager::getInstance().registerParser(*this);
+	}
+
+	virtual ~LLDBEngine()
+	{
+		SBDebugger::Destroy(m_debugger);
+	}
+
+	// From IEngine
+	virtual int registerBreakpoint(unsigned long addr)
+	{
+		if (m_useLLDBBreakpoints) {
+			SBBreakpoint bp = m_target.BreakpointCreateByAddress(addr);
+
+			if (!bp.IsValid())
+				return -1;
+
+			return bp.GetID();
+		}
+
+		// Use raw writes, faster but x86-only
+		int data;
+
+		// There already?
+		if (m_instructionMap.find(addr) != m_instructionMap.end())
+			return 0;
+
+		data = peekByte(addr);
+		m_instructionMap[addr] = data;
+		pokeByte(addr, 0xcc);
+
+		return m_instructionMap.size();
+	}
+
+
+	// From IFileParser
+	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
+	{
+		m_filename = filename;
+
+		// This now assumes we have only one file, i.e., no shared libraries
+//		m_target = m_debugger.CreateTarget(m_filename.c_str());
+		SBError error;
+		m_target = m_debugger.CreateTarget(m_filename.c_str(), NULL, NULL, true, error);
+
+		if (!m_target.IsValid())
+			return false;
+
+
+		for (FileListenerList_t::const_iterator it = m_fileListeners.begin();
+				it != m_fileListeners.end();
+				++it)
+			(*it)->onFile(File(m_filename, IFileParser::FLG_NONE));
+
+		return true;
+	}
+
+	virtual bool setMainFileRelocation(unsigned long relocation)
+	{
+		return true;
+	}
+
+	virtual void registerLineListener(ILineListener &listener)
+	{
+		m_lineListeners.push_back(&listener);
+	}
+
+	virtual void registerFileListener(IFileListener &listener)
+	{
+		m_fileListeners.push_back(&listener);
+	}
+
+	virtual bool parse()
+	{
+		// Parse the file/line -> address mappings
+		for (uint32_t i = 0; i < m_target.GetNumModules(); i++)
+		{
+			SBModule cur = m_target.GetModuleAtIndex(i);
+
+			if (!cur.IsValid())
+				continue;
+
+			// Have we already parsed this module?
+			auto fs = cur.GetFileSpec();
+			if (!fs.IsValid())
+				continue;
+
+			std::string key = fmt("%s/%s", fs.GetDirectory(), fs.GetFilename());
+
+			if (m_parsedModules[key])
+			{
+				continue;
+			}
+
+			m_parsedModules[key] = true;
+
+			// Skip this big and unneeded module
+			if (key == "/usr/lib/dyld")
+			{
+				continue;
+			}
+
+			handleModule(cur);
+		}
+
+		return true;
+	}
+
+	virtual uint64_t getChecksum()
+	{
+		return 0;
+	}
+
+	virtual enum IFileParser::PossibleHits maxPossibleHits()
+	{
+		return IFileParser::HITS_LIMITED;
+	}
+
+	virtual void setupParser(IFilter *filter)
+	{
+		m_filter = filter;
+	}
+
+	std::string getParserType()
+	{
+		return "lldb";
+	}
+
+	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		return 1;
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		char buf[MAXPATHLEN + 1];
+		SBError error;
+		SBListener l;
+
+		IConfiguration &conf = IConfiguration::getInstance();
+
+
+		m_listener = &listener;
+
+		if (!getcwd(buf, sizeof(buf))) {
+			error("No current WD?\n");
+
+			return false;
+		}
+
+		// Configurable via the command line
+		m_useLLDBBreakpoints = !conf.keyAsInt("lldb-use-raw-breakpoint-writes");
+
+		unsigned int pid = conf.keyAsInt("attach-pid");
+
+		if (pid != 0) {
+			m_process = m_target.AttachToProcessWithID(l, (lldb::pid_t)pid, error);
+		} else {
+			// Launch process
+			m_process = m_target.Launch(l,
+					&IConfiguration::getInstance().getArgv()[1], // Minus the executable
+					(const char **)environ,
+					"/dev/stdin",
+					"/dev/stdout",
+					"/dev/stderr",
+					buf,
+					eLaunchFlagDisableASLR, // We can then use file addresses
+					true, // Stop at entry point
+					error);
+		}
+
+		if (!m_process.IsValid()) {
+			error("Cannot launch process: %s\n", error.GetCString());
+
+			return false;
+		}
+
+		if (error.Fail()) {
+			error("Launch failure\n");
+
+			return false;
+		}
+
+		// Special-case fork to workaround LLDB lack of follow-fork-mode
+		m_forkBreakpoint = m_target.BreakpointCreateByName("fork");
+
+		// Where the parent returns to after fork
+		if (!m_forkBreakpoint.IsValid())
+			warning("Can't set breakpoint at fork\n");
+
+		// Send all signals to the process
+		SBUnixSignals sigs = m_process.GetUnixSignals();
+		for (unsigned int i = SIGHUP; i < SIGUSR2; i++) {
+			sigs.SetShouldNotify(i, false);
+			sigs.SetShouldStop(i, true);
+			sigs.SetShouldSuppress(i, false);
+		}
+
+		return true;
+	}
+
+	bool continueExecution()
+	{
+		StateType state = m_process.GetState();
+		Event ev;
+
+		// If shared libraries has been added, parse again
+		if (m_target.GetNumModules() != m_parsedModules.size())
+		{
+			parse();
+		}
+
+		kcov_debug(BP_MSG, "STOPPED in state %d\n", state);
+
+		switch (state)
+		{
+			case eStateStopped:
+			{
+				ev = handleStop();
+			} break;
+
+			case eStateExited:
+			{
+				ev = Event(ev_exit, m_process.GetExitStatus());
+			} break;
+
+			default:
+				break;
+		}
+
+		m_listener->onEvent(ev);
+
+		// Don't continue on exit (saves a lot of execution time)
+		if (ev.type == ev_exit)
+			return false;
+
+		SBError err = m_process.Continue();
+
+		return err.Success();
+	}
+
+	Event handleStop()
+	{
+		SBThread curThread = m_process.GetSelectedThread();
+		SBFrame frame = curThread.GetSelectedFrame();
+
+		enum StopReason stopReason = curThread.GetStopReason();
+		unsigned long address = getAddress(frame.GetPCAddress());
+
+		switch (stopReason)
+		{
+			case eStopReasonSignal:
+			{
+				int signo = (int)curThread.GetStopReasonDataAtIndex(0);
+				enum event_type type = ev_signal;
+
+				if (signo == SIGSEGV || signo == SIGABRT)
+					type = ev_signal_exit;
+
+				return Event(type, signo, address);
+
+			} break;
+			case eStopReasonBreakpoint:
+			{
+				uint64_t id = curThread.GetStopReasonDataAtIndex(0);
+
+				/*
+				 * Special case for forks (OSX-specific):
+				 *
+				 * 1. Disable all breakpoints so that the child doesn't stop on INT3
+				 * 2. Set a temporary breakpoint in the parent fork return location
+				 * 3. Continue to this point. We have now started the child and are back in the parent.
+				 * 4. Enable all breakpoints again
+				 *
+				 */
+				if (m_forkBreakpoint.IsValid() && id == m_forkBreakpoint.GetID()) {
+					m_target.DisableAllBreakpoints();
+
+					SBBreakpoint inParent = m_target.BreakpointCreateByName("libSystem_atfork_parent");
+					if (inParent.IsValid()) {
+						m_process.Continue();
+						m_target.BreakpointDelete(inParent.GetID());
+					}
+
+					m_target.EnableAllBreakpoints();
+				} else {
+					m_target.BreakpointDelete(id);
+				}
+			} break;
+			case eStopReasonException:
+			{
+				uint64_t id = curThread.GetStopReasonDataAtIndex(0);
+
+				// Remove breakpoint by restoring the instruction again
+				address--;
+				InstructionMap_t::iterator it = m_instructionMap.find(address);
+
+				if (id == 6 && it != m_instructionMap.end()) {
+					pokeByte(address, m_instructionMap[address]);
+					frame.SetPC(address);
+				} else {
+					// Can't find this breakpoint or unknown exception type?
+					return Event(ev_error, -1, address);
+				}
+			} break;
+
+			default:
+				kcov_debug(BP_MSG, "Unknown stop reason %d\n", stopReason);
+				break;
+		}
+
+		return Event(ev_breakpoint, -1, address);
+	}
+
+
+	void kill(int signal)
+	{
+		m_process.Signal(signal);
+	}
+
+
+private:
+	int peekByte(unsigned long addr)
+	{
+		SBError error;
+		uint8_t out;
+
+		if (m_target.ReadMemory(SBAddress(addr, m_target), &out, sizeof(out), error) != sizeof(out))
+			return -1;
+
+		return out;
+	}
+
+	bool pokeByte(unsigned long addr, uint8_t data)
+	{
+		SBError error;
+
+		return m_process.WriteMemory(addr, &data, sizeof(data), error) == sizeof(data);
+	}
+
+	unsigned long getAddress(const SBAddress &addr) const
+	{
+		return addr.GetLoadAddress(m_target);
+	}
+
+	void handleModule(SBModule &module)
+	{
+		for (uint32_t i = 0; i < module.GetNumCompileUnits(); i++)
+		{
+			SBCompileUnit cu = module.GetCompileUnitAtIndex(i);
+
+			if (!cu.IsValid())
+				continue;
+
+			handleCompileUnit(module, cu);
+		}
+	}
+
+	// The file:line -> address mappings are in the compile units
+	void handleCompileUnit(SBModule &module, SBCompileUnit &cu)
+	{
+		for (uint32_t i = 0; i < cu.GetNumLineEntries(); i++)
+		{
+			SBLineEntry cur = cu.GetLineEntryAtIndex(i);
+
+			if (!cur.IsValid())
+				continue;
+
+			// Filename
+			SBFileSpec fs = cur.GetFileSpec();
+			if (!fs.IsValid())
+				continue;
+
+			// The address where the program is at
+			SBAddress addr = cur.GetStartAddress();
+
+			std::string filename = fmt("%s/%s", fs.GetDirectory(), fs.GetFilename());
+
+			std::string rp = m_filter->mangleSourcePath(filename);
+
+			for (LineListenerList_t::const_iterator lit = m_lineListeners.begin();
+				lit != m_lineListeners.end();
+				++lit)
+				(*lit)->onLine(rp, cur.GetLine(), getAddress(addr));
+		}
+
+	}
+
+	typedef std::vector<ILineListener *> LineListenerList_t;
+	typedef std::vector<IFileListener *> FileListenerList_t;
+	typedef std::unordered_map<unsigned long, unsigned long > InstructionMap_t;
+
+	std::string m_filename;
+
+	LineListenerList_t m_lineListeners;
+	FileListenerList_t m_fileListeners;
+
+	IEventListener *m_listener;
+	SBDebugger m_debugger;
+	SBTarget m_target;
+	SBProcess m_process;
+	SBBreakpoint m_forkBreakpoint;
+
+	InstructionMap_t m_instructionMap;
+	bool m_useLLDBBreakpoints;
+
+	IFilter *m_filter;
+
+
+	std::unordered_map<std::string, bool> m_parsedModules;
+};
+
+
+
+// This ugly stuff was inherited from bashEngine
+static LLDBEngine *g_lldbEngine;
+class LLDBCtor
+{
+public:
+	LLDBCtor()
+	{
+		g_lldbEngine = new LLDBEngine();
+	}
+};
+static LLDBCtor g_bashCtor;
+
+
+class LLDBEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~LLDBEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return g_lldbEngine;
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		// Unless #!/bin/sh etc, this should win
+		return 1;
+	}
+};
+
+static LLDBEngineCreator g_lldbEngineCreator;
diff --git a/kcov-38/src/engines/ptrace.cc b/kcov-38/src/engines/ptrace.cc
new file mode 100644
index 000000000000..b702e8d53450
--- /dev/null
+++ b/kcov-38/src/engines/ptrace.cc
@@ -0,0 +1,471 @@
+#include <sys/types.h>
+
+#include <engine.hh>
+#include <utils.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <solib-handler.hh>
+#include <file-parser.hh>
+#include <phdr_data.h>
+#include "ptrace_sys.hh"
+
+#include <sys/wait.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <mutex>
+#include <vector>
+
+using namespace kcov;
+
+#define str(s) #s
+#define xstr(s) str(s)
+
+static unsigned long getAligned(unsigned long addr)
+{
+	return (addr / sizeof(unsigned long)) * sizeof(unsigned long);
+}
+
+static unsigned long arch_setupBreakpoint(unsigned long addr, unsigned long old_data)
+{
+	unsigned long val;
+
+#if defined(__i386__) || defined(__x86_64__)
+	unsigned long aligned_addr = getAligned(addr);
+	unsigned long offs = addr - aligned_addr;
+	unsigned long shift = 8 * offs;
+
+	val = (old_data & ~(0xffUL << shift)) | (0xccUL << shift);
+#elif defined(__powerpc__)
+	val = 0x7fe00008; /* tw */
+#elif defined(__arm__)
+	val = 0xfedeffe7; // Undefined insn
+#elif defined(__aarch64__)
+	unsigned long aligned_addr = getAligned(addr);
+	unsigned long offs = addr - aligned_addr;
+	unsigned long shift = 8 * offs;
+
+	val = (old_data & ~(0xffffffffUL << shift)) | (0xd4200000UL << shift);
+#else
+# error Unsupported architecture
+#endif
+
+	return val;
+}
+
+static unsigned long arch_clearBreakpoint(unsigned long addr, unsigned long old_data, unsigned long cur_data)
+{
+	unsigned long val;
+#if defined(__i386__) || defined(__x86_64__)
+	unsigned long aligned_addr = getAligned(addr);
+	unsigned long offs = addr - aligned_addr;
+	unsigned long shift = 8 * offs;
+	unsigned long old_byte = (old_data >> shift) & 0xffUL;
+
+	val = (cur_data & ~(0xffUL << shift)) | (old_byte << shift);
+#else
+	val = old_data;
+#endif
+
+	return val;
+}
+
+class Ptrace : public IEngine
+{
+public:
+	Ptrace() : m_firstBreakpoint(true), m_activeChild(0), m_child(0), m_firstChild(0),
+		m_parentCpu(0), m_listener(NULL), m_signal(0)
+	{
+	}
+
+	~Ptrace()
+	{
+		kill(SIGTERM);
+		ptrace_sys::detach(m_activeChild);
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		m_listener = &listener;
+
+		m_parentCpu = ptrace_sys::get_current_cpu();
+		ptrace_sys::tie_process_to_cpu(getpid(), m_parentCpu);
+
+		m_instructionMap.clear();
+
+		/* Basic check first */
+		if (access(executable.c_str(), X_OK) != 0)
+			return false;
+
+		unsigned int pid = IConfiguration::getInstance().keyAsInt("attach-pid");
+		bool res = false;
+
+		if (pid != 0)
+			res = attachPid(pid);
+		else
+			res = forkChild(executable.c_str());
+
+		return res;
+	}
+
+	int registerBreakpoint(unsigned long addr)
+	{
+		if (addr == 0)
+			return -1;
+
+		unsigned long data;
+
+		// There already?
+		if (m_instructionMap.find(addr) != m_instructionMap.end())
+			return 0;
+
+		data = ptrace_sys::peekWord(m_activeChild, getAligned(addr));
+
+		m_instructionMap[addr] = data;
+		m_pendingBreakpoints.push_back(addr);
+
+		kcov_debug(BP_MSG, "BP registered at 0x%lx\n", addr);
+
+		return 0;
+	}
+
+	bool clearBreakpoint(unsigned long addr)
+	{
+		if (m_instructionMap.find(addr) == m_instructionMap.end())
+		{
+			kcov_debug(BP_MSG, "Can't find breakpoint at 0x%lx\n", addr);
+
+			// Stupid workaround for avoiding the solib thread race
+			msleep(1);
+
+			return false;
+		}
+
+		// Clear the actual breakpoint instruction
+		unsigned long val = m_instructionMap[addr];
+		val = arch_clearBreakpoint(addr, val, ptrace_sys::peekWord(m_activeChild, getAligned(addr)));
+
+		ptrace_sys::pokeWord(m_activeChild, getAligned(addr), val);
+
+		return true;
+	}
+
+	const Event waitEvent()
+	{
+		static uint64_t lastSignalAddress;
+		Event out;
+		int status;
+		pid_t who;
+
+		// Assume error
+		out.type = ev_error;
+		out.data = -1;
+
+		who = ptrace_sys::wait_all(&status);
+
+		if (who == -1)
+		{
+			kcov_debug(ENGINE_MSG, "Returning error\n");
+			return out;
+		}
+
+		m_children[who] = 1;
+
+		m_activeChild = who;
+		out.addr = ptrace_sys::getPc(m_activeChild);
+
+		kcov_debug(ENGINE_MSG, "PT stopped PID %d 0x%08x\n", m_activeChild, status);
+
+		// A signal?
+		if (WIFSTOPPED(status))
+		{
+			int sig = WSTOPSIG(status);
+			int sigill = SIGSYS;
+
+			// Arm is using an undefined instruction, so we'll get a SIGILL here
+#if defined(__arm__) || defined(__aarch64__)
+			sigill = SIGILL;
+#endif
+
+			out.type = ev_signal;
+			out.data = sig;
+			int event = ptrace_sys::getEvent(who, status);
+			if (ptrace_sys::eventIsNewChild(sig, event))
+			{
+				// Activate tracing on a new child
+				kcov_debug(ENGINE_MSG, "PT new child %d\n", m_activeChild);
+				ptrace_sys::follow_child(m_activeChild);
+				out.data = 0;
+			}
+			else if (ptrace_sys::eventIsForky(sig, event))
+			{
+				kcov_debug(ENGINE_MSG, "PT fork/clone at 0x%llx for %d\n", (unsigned long long) out.addr, m_activeChild);
+				out.data = 0;
+			}
+			else if (sig == SIGTRAP || sig == SIGSTOP || sig == sigill)
+			{
+				// A trap?
+				out.type = ev_breakpoint;
+				out.data = -1;
+
+				kcov_debug(ENGINE_MSG, "PT BP at 0x%llx:%d for %d\n", (unsigned long long) out.addr, out.data,
+						m_activeChild);
+
+				kcov_debug(ENGINE_MSG, "Looking for instruction %zx.\n", out.addr);
+				bool insnFound = m_instructionMap.find(out.addr) != m_instructionMap.end();
+
+				// Single-step if we have this BP
+				if (insnFound)
+					ptrace_sys::singleStep(m_activeChild);
+				else if (sig != SIGSTOP)
+					ptrace_sys::skipInstruction(m_activeChild);
+
+				// Wait for solib data if this is the first time
+				if (m_firstBreakpoint && insnFound)
+				{
+					blockUntilSolibDataRead();
+					m_firstBreakpoint = false;
+				}
+
+				return out;
+			}
+
+			kcov_debug(ENGINE_MSG, "PT signal %d at 0x%llx for %d\n", WSTOPSIG(status), (unsigned long long) out.addr,
+					m_activeChild);
+			lastSignalAddress = out.addr;
+		}
+		else if (WIFSIGNALED(status))
+		{
+			// Crashed/killed
+			int sig = WTERMSIG(status);
+
+			out.type = ev_signal;
+			out.data = sig;
+			out.addr = lastSignalAddress;
+
+			kcov_debug(ENGINE_MSG, "PT terminating signal %d at 0x%llx for %d\n", sig, (unsigned long long) out.addr,
+					m_activeChild);
+			m_children.erase(who);
+
+			if (!childrenLeft())
+				out.type = ev_signal_exit;
+
+		}
+		else if (WIFEXITED(status))
+		{
+			int exitStatus = WEXITSTATUS(status);
+
+			kcov_debug(ENGINE_MSG, "PT exit %d at 0x%llx for %d%s\n", exitStatus, (unsigned long long) out.addr,
+					m_activeChild, m_activeChild == m_firstChild ? " (first child)" : "");
+
+			m_children.erase(who);
+
+			if (who == m_firstChild)
+				out.type = ev_exit_first_process;
+			else
+				out.type = ev_exit;
+
+			out.data = exitStatus;
+		}
+
+		return out;
+	}
+
+	bool childrenLeft()
+	{
+		return m_children.size() > 0 && m_children.find(m_firstChild) != m_children.end();
+	}
+
+	/**
+	 * Continue execution with an event
+	 */
+	bool continueExecution()
+	{
+		int res;
+
+		setupAllBreakpoints();
+
+		kcov_debug(ENGINE_MSG, "PT continuing %d with signal %d\n", m_activeChild, m_signal);
+		res = ptrace_sys::cont(m_activeChild, m_signal);
+		if (res < 0)
+		{
+			kcov_debug(ENGINE_MSG, "PT error for %d: %d\n", m_activeChild, res);
+			m_children.erase(m_activeChild);
+		}
+
+		Event ev = waitEvent();
+		m_signal = ev.type == ev_signal ? ev.data : 0;
+
+		if (m_listener)
+			m_listener->onEvent(ev);
+
+		if (ev.type == ev_breakpoint)
+			clearBreakpoint(ev.addr);
+
+		if (ev.type == ev_error)
+			return false;
+
+		return true;
+	}
+
+	void kill(int signal)
+	{
+		// Don't kill kcov itself (PID 0)
+		if (m_activeChild != 0)
+			::kill(m_activeChild, signal);
+	}
+
+private:
+
+	void setupAllBreakpoints()
+	{
+		for (PendingBreakpointList_t::const_iterator addrIt = m_pendingBreakpoints.begin();
+				addrIt != m_pendingBreakpoints.end(); ++addrIt)
+		{
+			unsigned long addr = *addrIt;
+			unsigned long cur_data = ptrace_sys::peekWord(m_activeChild, getAligned(addr));
+
+			// Set the breakpoint
+			ptrace_sys::pokeWord(m_activeChild, getAligned(addr), arch_setupBreakpoint(addr, cur_data));
+		}
+
+		m_pendingBreakpoints.clear();
+	}
+
+	bool forkChild(const char *executable)
+	{
+		char * const *argv = (char * const *) IConfiguration::getInstance().getArgv();
+		pid_t child, who;
+		int status;
+
+		/* Executable exists, try to launch it */
+		if ((child = fork()) == 0)
+		{
+			int res;
+
+			/* Avoid address randomization */
+			if (!ptrace_sys::disable_aslr())
+				return false;
+
+			/* And launch the process */
+			res = ptrace_sys::trace_me();
+			if (res < 0)
+			{
+				perror("Can't set me as ptraced");
+				return false;
+			}
+			ptrace_sys::tie_process_to_cpu(getpid(), m_parentCpu);
+			execv(executable, argv);
+
+			/* Exec failed */
+			return false;
+		}
+
+		/* Fork error? */
+		if (child < 0)
+		{
+			perror("fork");
+			return false;
+		}
+		m_child = m_activeChild = m_firstChild = child;
+		// Might not be completely necessary (the child should inherit this
+		// from the parent), but better safe than sorry
+		ptrace_sys::tie_process_to_cpu(m_child, m_parentCpu);
+
+		kcov_debug(ENGINE_MSG, "PT forked %d\n", child);
+
+		/* Wait for the initial stop */
+		who = waitpid(child, &status, 0);
+		if (who < 0)
+		{
+			perror("waitpid");
+			return false;
+		}
+		if (!WIFSTOPPED(status))
+		{
+			fprintf(stderr, "Child hasn't stopped: %x\n", status);
+			return false;
+		}
+
+		ptrace_sys::follow_fork(m_activeChild);
+
+		return true;
+	}
+
+	bool attachPid(pid_t pid)
+	{
+		int rv;
+
+		m_child = m_activeChild = m_firstChild = pid;
+
+		errno = 0;
+		rv = ptrace_sys::attachAll(m_activeChild);
+		//rv = ptrace(PTRACE_ATTACH, m_activeChild, 0, 0);
+		if (rv < 0)
+		{
+			const char *err = strerror(errno);
+
+			fprintf(stderr, "Can't attach to %d. Error %s\n", pid, err);
+			return false;
+		}
+
+		/* Wait for the initial stop */
+		int status;
+		int who = waitpid(m_activeChild, &status, 0);
+		if (who < 0)
+		{
+			perror("waitpid");
+			return false;
+		}
+		if (!WIFSTOPPED(status))
+		{
+			fprintf(stderr, "Child hasn't stopped: %x\n", status);
+			return false;
+		}
+		ptrace_sys::tie_process_to_cpu(m_activeChild, m_parentCpu);
+
+		return true;
+	}
+
+	typedef std::unordered_map<unsigned long, unsigned long> instructionMap_t;
+	typedef std::vector<unsigned long> PendingBreakpointList_t;
+	typedef std::unordered_map<pid_t, int> ChildMap_t;
+
+	instructionMap_t m_instructionMap;
+	PendingBreakpointList_t m_pendingBreakpoints;
+	bool m_firstBreakpoint;
+
+	pid_t m_activeChild;
+	pid_t m_child;
+	pid_t m_firstChild;
+	ChildMap_t m_children;
+
+	int m_parentCpu;
+
+	IEventListener *m_listener;
+	int m_signal;
+};
+
+class PtraceEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~PtraceEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return new Ptrace();
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		// Unless #!/bin/sh etc, this should win
+		return 1;
+	}
+};
+
+static PtraceEngineCreator g_ptraceEngineCreator;
diff --git a/kcov-38/src/engines/ptrace_freebsd.cc b/kcov-38/src/engines/ptrace_freebsd.cc
new file mode 100644
index 000000000000..a200fb504a38
--- /dev/null
+++ b/kcov-38/src/engines/ptrace_freebsd.cc
@@ -0,0 +1,184 @@
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+
+#include "ptrace_sys.hh"
+
+static void arch_adjustPcAfterBreakpoint(struct reg *regs);
+unsigned long arch_getPcFromRegs(struct reg *regs);
+static unsigned long getPcFromRegs(struct reg *regs);
+static long getRegs(pid_t pid, void *addr, struct reg *regs);
+static long setRegs(pid_t pid, void *addr, struct reg *regs);
+
+
+static void
+arch_adjustPcAfterBreakpoint(struct reg *regs)
+{
+#if defined(__x86_64__)
+	regs->r_rip--;
+#else
+# error Unsupported architecture
+#endif
+}
+
+unsigned long arch_getPcFromRegs(struct reg *regs)
+{
+#if defined(__x86_64__)
+	return(regs->r_rip) - 1;
+#else
+# error Unsupported architecture
+#endif
+}
+
+int
+ptrace_sys::attachAll (pid_t pid)
+{
+	return (ptrace(PT_ATTACH, pid, 0, 0) < 0 ? errno: 0);
+}
+
+int
+ptrace_sys::cont(pid_t pid, int signal)
+{
+	return ptrace(PT_CONTINUE, pid, (caddr_t)1, signal);
+}
+
+void
+ptrace_sys::detach(pid_t pid)
+{
+	ptrace(PT_DETACH, pid, 0, 0);
+}
+
+bool
+ptrace_sys::disable_aslr(void)
+{
+	return true;
+}
+
+bool
+ptrace_sys::eventIsForky(int signal, int event)
+{
+	return (signal == SIGTRAP && (event & PL_FLAG_FORKED));
+}
+
+bool
+ptrace_sys::eventIsNewChild(int signal, int event)
+{
+	return (signal == SIGSTOP && (event & PL_FLAG_CHILD));
+}
+
+int
+ptrace_sys::follow_child(pid_t pid)
+{
+	return ptrace_sys::follow_fork(pid);
+}
+
+int
+ptrace_sys::follow_fork(pid_t pid)
+{
+	return ptrace(PT_FOLLOW_FORK, pid, NULL, 1);
+}
+
+int
+ptrace_sys::getEvent(pid_t pid, int status)
+{
+	struct ptrace_lwpinfo lwpinfo;
+	ptrace(PT_LWPINFO, pid, (caddr_t)&lwpinfo, sizeof(lwpinfo));
+	return (lwpinfo.pl_flags);
+}
+
+unsigned long
+ptrace_sys::getPc(int pid)
+{
+	struct reg regs;
+	getRegs(pid, NULL, &regs);
+	return getPcFromRegs(&regs);
+}
+
+int
+ptrace_sys::get_current_cpu(void)
+{
+	return 0;
+}
+
+static unsigned long
+getPcFromRegs(struct reg *regs)
+{
+	return arch_getPcFromRegs(regs);
+}
+
+static long
+getRegs(pid_t pid, void *addr, struct reg *regs)
+{
+	return ptrace(PT_GETREGS, pid, (caddr_t)regs, 0);
+}
+
+unsigned long
+ptrace_sys::peekWord(pid_t pid, unsigned long aligned_addr)
+{
+	unsigned long val;
+
+	struct ptrace_io_desc ptiod =
+	{
+		.piod_op = PIOD_READ_I,
+		.piod_offs = (void*)aligned_addr,
+		.piod_addr = &val,
+		.piod_len = sizeof(val)
+	};
+	ptrace(PT_IO, pid, (caddr_t)&ptiod, 0);
+	return val;
+}
+
+void
+ptrace_sys::pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value)
+{
+	struct ptrace_io_desc ptiod =
+	{
+		.piod_op = PIOD_WRITE_I,
+		.piod_offs = (void*)aligned_addr,
+		.piod_addr = &value,
+		.piod_len = sizeof(value)
+	};
+	ptrace(PT_IO, pid, (caddr_t)&ptiod, 0);
+}
+
+static long
+setRegs(pid_t pid, void *addr, struct reg *regs)
+{
+	return ptrace(PT_SETREGS, pid, (caddr_t)regs, 0);
+}
+
+void
+ptrace_sys::singleStep(pid_t pid)
+{
+	// Step back one instruction
+	struct reg regs;
+	getRegs(pid, NULL, &regs);
+	arch_adjustPcAfterBreakpoint(&regs);
+	setRegs(pid, NULL, &regs);
+}
+
+// Skip over this instruction
+void
+ptrace_sys::skipInstruction(pid_t pid)
+{
+	// Nop on x86 and x86_64
+}
+
+void
+ptrace_sys::tie_process_to_cpu(pid_t pid, int cpu)
+{
+}
+
+int
+ptrace_sys::trace_me(void)
+{
+	return ptrace(PT_TRACE_ME, 0, 0, 0);
+}
+
+pid_t
+ptrace_sys::wait_all(int *status)
+{
+	return waitpid(-1, status, WSTOPPED);
+}
diff --git a/kcov-38/src/engines/ptrace_linux.cc b/kcov-38/src/engines/ptrace_linux.cc
new file mode 100644
index 000000000000..bd25d0efef52
--- /dev/null
+++ b/kcov-38/src/engines/ptrace_linux.cc
@@ -0,0 +1,430 @@
+#include <sys/types.h>
+#include <sys/personality.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
+#if defined(__aarch64__)
+#  include <sys/uio.h>
+#  include <elf.h>
+#endif
+
+#include <dirent.h>
+#include <sched.h>
+#include <stdio.h>
+#include <string.h>
+#include <unordered_map>
+
+#include "ptrace_sys.hh"
+#include "utils.hh"
+
+enum
+{
+	i386_EIP = 12, x86_64_RIP = 16, ppc_NIP = 32, arm_PC = 15, aarch64_PC = 32, // See Linux arch/arm64/include/asm/ptrace.h
+};
+
+static void arch_adjustPcAfterBreakpoint(unsigned long *regs);
+static unsigned long arch_getPcFromRegs(unsigned long *regs);
+static int attachLwp(int lwpid);
+static unsigned long getPcFromRegs(unsigned long *regs);
+static long getRegs(pid_t pid, void *addr, void *regs, size_t len);
+static int kill_lwp(unsigned long lwpid, int signo);
+static int linux_proc_get_int(pid_t lwpid, const char *field);
+static int linux_proc_pid_has_state(pid_t pid, const char *state);
+static int linux_proc_pid_is_stopped(pid_t pid);
+static int linux_proc_get_tgid(pid_t lwpid);
+static long setRegs(pid_t pid, void *addr, void *regs, size_t len);
+
+static void arch_adjustPcAfterBreakpoint(unsigned long *regs)
+{
+#if defined(__i386__)
+	regs[i386_EIP]--;
+#elif defined(__x86_64__)
+	regs[x86_64_RIP]--;
+#elif defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)
+	// Do nothing
+#else
+# error Unsupported architecture
+#endif
+}
+
+static unsigned long arch_getPcFromRegs(unsigned long *regs)
+{
+	unsigned long out;
+
+#if defined(__i386__)
+	out = regs[i386_EIP] - 1;
+#elif defined(__x86_64__)
+	out = regs[x86_64_RIP] - 1;
+#elif defined(__arm__)
+	out = regs[arm_PC];
+#elif defined(__aarch64__)
+	out = regs[aarch64_PC];
+#elif defined(__powerpc__)
+	out = regs[ppc_NIP];
+#else
+# error Unsupported architecture
+#endif
+
+	return out;
+}
+
+int ptrace_sys::attachAll(pid_t pid)
+{
+	int err;
+
+	/* Attach to PID.  We will check for other threads soon. */
+	err = attachLwp(pid);
+	if (err != 0)
+		error("Cannot attach to process %d\n", pid);
+
+	if (linux_proc_get_tgid(pid) != pid)
+	{
+		return 0;
+	}
+
+	DIR *dir;
+	char pathname[128];
+
+	sprintf(pathname, "/proc/%d/task", pid);
+
+	dir = opendir(pathname);
+
+	if (!dir)
+	{
+		error("Could not open /proc/%d/task.\n", pid);
+
+		return 0;
+	}
+
+	/* At this point we attached to the tgid.  Scan the task for
+	 * existing threads. */
+	int new_threads_found;
+	int iterations = 0;
+
+	std::unordered_map<unsigned long, bool> threads;
+	threads[pid] = true;
+
+	while (iterations < 2)
+	{
+		struct dirent *dp;
+
+		new_threads_found = 0;
+		/* Add all the other threads.  While we go through the
+		 * threads, new threads may be spawned.  Cycle through
+		 * the list of threads until we have done two iterations without
+		 * finding new threads.  */
+		while ((dp = readdir(dir)) != NULL)
+		{
+			int lwp;
+
+			/* Fetch one lwp.  */
+			lwp = strtoul(dp->d_name, NULL, 10);
+
+			/* Is this a new thread?  */
+			if (lwp != 0 && threads.find(lwp) == threads.end())
+			{
+				int err;
+				threads[lwp] = true;
+
+				err = attachLwp(lwp);
+				if (err != 0)
+					warning("Cannot attach to lwp %d\n", lwp);
+
+				new_threads_found++;
+			}
+		}
+
+		if (!new_threads_found)
+			iterations++;
+		else
+			iterations = 0;
+
+		rewinddir(dir);
+	}
+	closedir(dir);
+
+	return 0;
+}
+
+/* Attach to an inferior process. */
+static int attachLwp(int lwpid)
+{
+	int rv;
+
+	rv = ptrace(PTRACE_ATTACH, lwpid, 0, 0);
+
+	if (rv < 0)
+		return errno;
+	ptrace(PTRACE_SETOPTIONS, lwpid, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK);
+
+	if (!linux_proc_pid_is_stopped(lwpid))
+	{
+		/*
+		 * First make sure there is a pending SIGSTOP.  Since we are
+		 * already attached, the process can not transition from stopped
+		 * to running without a PTRACE_CONT; so we know this signal will
+		 * go into the queue.  The SIGSTOP generated by PTRACE_ATTACH is
+		 * probably already in the queue (unless this kernel is old
+		 * enough to use TASK_STOPPED for ptrace stops); but since
+		 * SIGSTOP is not an RT signal, it can only be queued once.  */
+		kill_lwp(lwpid, SIGSTOP);
+	}
+
+	return 0;
+}
+
+int ptrace_sys::cont(pid_t pid, int signal)
+{
+	return ptrace(PTRACE_CONT, pid, 0, signal);
+}
+
+void ptrace_sys::detach(pid_t pid)
+{
+	ptrace(PTRACE_DETACH, pid, 0, 0);
+}
+
+bool ptrace_sys::disable_aslr(void)
+{
+	int persona = personality(0xffffffff);
+	if (persona < 0)
+	{
+		perror("Can't get personality");
+		return false;
+	}
+	persona |= 0x0040000; /* ADDR_NO_RANDOMIZE */
+	if (personality(persona) < 0)
+	{
+		perror("Can't set personality");
+		return false;
+	}
+	return true;
+}
+
+bool ptrace_sys::eventIsForky(int signal, int event)
+{
+	return (signal == SIGTRAP && (event == PTRACE_EVENT_CLONE || event == PTRACE_EVENT_FORK || event == PTRACE_EVENT_VFORK));
+}
+
+bool ptrace_sys::eventIsNewChild(int signal, int event)
+{
+	return false;
+}
+
+int ptrace_sys::follow_child(pid_t pid)
+{
+	return 0;
+}
+
+int ptrace_sys::follow_fork(pid_t pid)
+{
+	return ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK);
+}
+
+/* Return non-zero if 'State' of /proc/PID/status contains STATE.  */
+static int linux_proc_get_int(pid_t lwpid, const char *field)
+{
+	size_t field_len = strlen(field);
+	FILE *status_file;
+	char buf[100];
+	int retval = -1;
+
+	snprintf(buf, sizeof(buf), "/proc/%d/status", (int) lwpid);
+	status_file = fopen(buf, "r");
+	if (status_file == NULL)
+	{
+		warning("unable to open /proc file '%s'", buf);
+		return -1;
+	}
+
+	while (fgets(buf, sizeof(buf), status_file))
+	{
+		if (strncmp(buf, field, field_len) == 0 && buf[field_len] == ':')
+		{
+			retval = (int) strtol(&buf[field_len + 1], NULL, 10);
+			break;
+		}
+	}
+
+	fclose(status_file);
+
+	return retval;
+}
+
+static int linux_proc_pid_has_state(pid_t pid, const char *state)
+{
+	char buffer[100];
+	FILE *procfile;
+	int retval;
+	int have_state;
+
+	xsnprintf(buffer, sizeof(buffer), "/proc/%d/status", (int ) pid);
+	procfile = fopen(buffer, "r");
+	if (procfile == NULL)
+	{
+		warning("unable to open /proc file '%s'", buffer);
+		return 0;
+	}
+
+	have_state = 0;
+	while (fgets(buffer, sizeof(buffer), procfile) != NULL)
+	{
+		if (strncmp(buffer, "State:", 6) == 0)
+		{
+			have_state = 1;
+			break;
+		}
+	}
+	retval = (have_state && strstr(buffer, state) != NULL);
+	fclose(procfile);
+	return retval;
+}
+
+/* Detect `T (stopped)' in `/proc/PID/status'.
+ * Other states including `T (tracing stop)' are reported as false.
+ */
+static int linux_proc_pid_is_stopped(pid_t pid)
+{
+	return linux_proc_pid_has_state(pid, "T (stopped)");
+}
+
+static int linux_proc_get_tgid(pid_t lwpid)
+{
+	return linux_proc_get_int(lwpid, "Tgid");
+}
+
+int ptrace_sys::get_current_cpu(void)
+{
+	return sched_getcpu();
+}
+
+int ptrace_sys::getEvent(pid_t pid, int status)
+{
+	return (status >> 16);
+}
+
+unsigned long ptrace_sys::getPc(int pid)
+{
+	unsigned long regs[1024];
+
+	memset(regs, 0, sizeof regs);
+	getRegs(pid, NULL, regs, sizeof regs);
+	return getPcFromRegs(regs);
+}
+
+static unsigned long getPcFromRegs(unsigned long *regs)
+{
+	return arch_getPcFromRegs(regs);
+}
+
+static long getRegs(pid_t pid, void *addr, void *regs, size_t len)
+{
+#if defined(__aarch64__)
+	struct iovec iov =
+	{	regs, len};
+	return ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov);
+#else
+	(void) len;
+	return ptrace((__ptrace_request ) PTRACE_GETREGS, pid, NULL, regs);
+#endif
+}
+
+static int kill_lwp(unsigned long lwpid, int signo)
+{
+	/* Use tkill, if possible, in case we are using nptl threads.  If tkill
+	 * fails, then we are not using nptl threads and we should be using kill. */
+
+#ifdef __NR_tkill
+	{
+		static int tkill_failed;
+
+		if (!tkill_failed)
+		{
+			int ret;
+
+			errno = 0;
+			ret = syscall (__NR_tkill, lwpid, signo);
+			if (errno != ENOSYS)
+			return ret;
+			tkill_failed = 1;
+		}
+	}
+#endif
+
+	return kill(lwpid, signo);
+}
+
+unsigned long ptrace_sys::peekWord(pid_t pid, unsigned long aligned_addr)
+{
+
+	return ptrace((__ptrace_request ) PTRACE_PEEKTEXT, pid, aligned_addr, 0);
+}
+
+void ptrace_sys::pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value)
+{
+	ptrace((__ptrace_request ) PTRACE_POKETEXT, pid, aligned_addr, value);
+}
+
+static long setRegs(pid_t pid, void *addr, void *regs, size_t len)
+{
+#if defined(__aarch64__)
+	struct iovec iov =
+	{	regs, len};
+	return ptrace(PTRACE_SETREGSET, pid, (void *)NT_PRSTATUS, &iov);
+#else
+	(void) len;
+	return ptrace((__ptrace_request ) PTRACE_SETREGS, pid, NULL, regs);
+#endif
+}
+
+void ptrace_sys::singleStep(pid_t pid)
+{
+	// Step back one instruction
+	unsigned long regs[1024];
+	getRegs(pid, NULL, regs, sizeof regs);
+	arch_adjustPcAfterBreakpoint(regs);
+	setRegs(pid, NULL, regs, sizeof regs);
+}
+
+// Skip over this instruction
+void ptrace_sys::skipInstruction(pid_t pid)
+{
+	// Nop on x86, op on PowerPC/ARM
+#if defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)
+	unsigned long regs[1024];
+
+	getRegs(pid, NULL, regs, sizeof regs);
+
+# if defined(__powerpc__)
+	regs[ppc_NIP] += 4;
+# elif defined(__aarch64__)
+	regs[aarch64_PC] += 4;
+# else
+	regs[arm_PC] += 4;
+# endif
+	setRegs(pid, NULL, regs, sizeof regs);
+#endif
+}
+
+void ptrace_sys::tie_process_to_cpu(pid_t pid, int cpu)
+{
+	// Switching CPU while running will cause icache
+	// conflicts. So let's just forbid that.
+
+	int max_cpu = 4096;
+	cpu_set_t *set = CPU_ALLOC(max_cpu);
+	panic_if(!set, "Can't allocate CPU set!\n");
+	CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu), set);
+	CPU_SET(cpu, set);
+	panic_if(sched_setaffinity(pid, CPU_ALLOC_SIZE(max_cpu), set) < 0, "Can't set CPU affinity. Coincident won't work");
+	CPU_FREE(set);
+}
+
+int ptrace_sys::trace_me(void)
+{
+	return ptrace(PTRACE_TRACEME, 0, 0, 0);
+}
+
+pid_t ptrace_sys::wait_all(int *status)
+{
+	return waitpid(-1, status, __WALL);
+}
diff --git a/kcov-38/src/engines/ptrace_sys.hh b/kcov-38/src/engines/ptrace_sys.hh
new file mode 100644
index 000000000000..3b06c475f630
--- /dev/null
+++ b/kcov-38/src/engines/ptrace_sys.hh
@@ -0,0 +1,26 @@
+namespace ptrace_sys
+{
+
+int attachAll (pid_t pid);
+int cont(pid_t pid, int signal);
+void detach(pid_t pid);
+bool disable_aslr(void);
+// Does this event relate to creating new processes or threads?
+bool eventIsForky(int signal, int event);
+// Does this event come from a newly created, traced, child?
+bool eventIsNewChild(int signal, int event);
+int follow_child(pid_t pid);
+int follow_fork(pid_t pid);
+int get_current_cpu(void);
+// Get the event that caused a trap.  The event is opaque to the caller.
+int getEvent(pid_t pid, int status);
+unsigned long getPc(int pid);
+unsigned long peekWord(pid_t pid, unsigned long aligned_addr);
+void pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value);
+void singleStep(pid_t pid);
+void skipInstruction(pid_t pid);
+void tie_process_to_cpu(pid_t pid, int cpu);
+int trace_me(void);
+int wait_all(int *status);
+
+}
diff --git a/kcov-38/src/engines/python-engine.cc b/kcov-38/src/engines/python-engine.cc
new file mode 100644
index 000000000000..3aa5c3e4a823
--- /dev/null
+++ b/kcov-38/src/engines/python-engine.cc
@@ -0,0 +1,474 @@
+#include <file-parser.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <lineid.hh>
+#include <utils.hh>
+#include <source-file-cache.hh>
+#include <generated-data-base.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+#include <list>
+#include <unordered_map>
+#include <vector>
+
+#include <swap-endian.hh>
+
+#include "script-engine-base.hh"
+
+using namespace kcov;
+
+extern GeneratedData python_helper_data;
+
+
+const uint64_t COVERAGE_MAGIC = 0x6d6574616c6c6775ULL; // "metallgut"
+
+/* Should be 8-byte aligned */
+struct coverage_data
+{
+	uint64_t magic;
+	uint32_t size;
+	uint32_t line;
+	const char filename[];
+};
+
+class PythonEngine : public ScriptEngineBase
+{
+public:
+	PythonEngine() :
+			ScriptEngineBase(), m_child(0), m_pipe(NULL)
+	{
+	}
+
+	~PythonEngine()
+	{
+		kill(SIGTERM);
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		std::string command = conf.keyAsString("python-command");
+
+		std::string kcov_python_pipe_path = IOutputHandler::getInstance().getOutDirectory() + "kcov-python.pipe";
+		std::string kcov_python_path = IOutputHandler::getInstance().getBaseDirectory() + "python-helper.py";
+
+		if (!executable_exists_in_path(command))
+		{
+			error("Cannot find Python parser '%s'", command.c_str());
+
+			return false;
+		}
+
+		if (write_file(python_helper_data.data(), python_helper_data.size(), "%s", kcov_python_path.c_str()) < 0)
+		{
+			error("Can't write python helper at %s", kcov_python_path.c_str());
+
+			return false;
+		}
+
+		m_listener = &listener;
+
+		std::string kcov_python_env = "KCOV_PYTHON_PIPE_PATH=" + kcov_python_pipe_path;
+		unlink(kcov_python_pipe_path.c_str());
+		if (mkfifo(kcov_python_pipe_path.c_str(), 0600) < 0)
+		{
+			error("Can't create python FIFO %s\n", kcov_python_pipe_path.c_str());
+
+			return false;
+		}
+
+		char *envString = (char *) xmalloc(kcov_python_env.size() + 1);
+		strcpy(envString, kcov_python_env.c_str());
+
+		putenv(envString);
+
+		/* Launch the python helper */
+		m_child = fork();
+		if (m_child == 0)
+		{
+			const char **argv = conf.getArgv();
+			unsigned int argc = conf.getArgc();
+
+			std::string s = fmt("%s %s ", command.c_str(), kcov_python_path.c_str());
+			for (unsigned int i = 0; i < argc; i++)
+				s += "'" + std::string(argv[i]) + "' ";
+
+			int res;
+
+			res = system(s.c_str());
+			panic_if(res < 0, "Can't execute python helper");
+
+			exit(WEXITSTATUS(res));
+		}
+		else if (m_child < 0)
+		{
+			perror("fork");
+
+			return false;
+		}
+		m_pipe = fopen(kcov_python_pipe_path.c_str(), "r");
+		panic_if(!m_pipe, "Can't open python pipe %s", kcov_python_pipe_path.c_str());
+
+		return true;
+	}
+
+	bool checkEvents()
+	{
+		uint8_t buf[8192];
+		struct coverage_data *p;
+
+		p = readCoverageDatum(buf, sizeof(buf));
+
+		if (!p)
+		{
+			reportEvent(ev_error, -1);
+
+			return false;
+		}
+
+		if (!m_reportedFiles[p->filename])
+		{
+			m_reportedFiles[p->filename] = true;
+
+			for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
+				(*it)->onFile(File(p->filename, IFileParser::FLG_NONE));
+
+			parseFile(p->filename);
+		}
+
+		if (m_listener)
+		{
+			uint64_t address = 0;
+			Event ev;
+
+			LineIdToAddressMap_t::const_iterator it = m_lineIdToAddress.find(getLineId(p->filename, p->line));
+			if (it != m_lineIdToAddress.end())
+				address = it->second;
+
+			ev.type = ev_breakpoint;
+			ev.addr = address;
+			ev.data = 1;
+
+			m_listener->onEvent(ev);
+		}
+
+		return true;
+	}
+
+	bool continueExecution()
+	{
+		if (checkEvents())
+			return true;
+
+		// Otherwise wait for child
+		int status;
+		int rv;
+
+		rv = waitpid(m_child, &status, WNOHANG);
+		if (rv != m_child)
+			return true;
+
+		if (WIFEXITED(status))
+		{
+			reportEvent(ev_exit_first_process, WEXITSTATUS(status));
+		}
+		else
+		{
+			warning("Other status: 0x%x\n", status);
+			reportEvent(ev_error, -1);
+		}
+
+		return false;
+	}
+
+	void kill(int signal)
+	{
+		if (m_child == 0)
+			return;
+
+		::kill(m_child, signal);
+	}
+
+	std::string getParserType()
+	{
+		return "python";
+	}
+
+	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		std::string s((const char *) data, 80);
+
+		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".py")
+			return 200;
+
+		if (s.find("python") != std::string::npos)
+			return 100;
+
+		return match_none;
+	}
+
+private:
+	void unmarshalCoverageData(struct coverage_data *p)
+	{
+		p->magic = be_to_host<uint64_t>(p->magic);
+		p->size = be_to_host<uint32_t>(p->size);
+		p->line = be_to_host<uint32_t>(p->line);
+	}
+
+	// Sweep through lines in a file to determine what is valid code
+	void parseFile(const std::string &filename)
+	{
+		if (!m_listener)
+			return;
+
+		ISourceFileCache &cache = ISourceFileCache::getInstance();
+
+		std::vector<std::string> lines = cache.getLines(filename);
+
+		// Compute hash for this file
+		uint32_t crc = cache.getCrc(filename);
+
+		unsigned int lineNo = 0;
+		enum
+		{
+			start, multiline_active
+		} state = start;
+		bool multiLineStartLine = false;
+
+		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
+		{
+			const std::string &s = trim_string(*it);
+
+			lineNo++;
+			// Empty line, ignore
+			if (s == "")
+				continue;
+
+			// Non-empty, but comment
+			if (s[0] == '#')
+				continue;
+
+			// Dict endings generate no code
+			if (s == "}" || s == "},")
+				continue;
+
+			// Ditto for list ends
+			if (s == "]" || s == "],")
+				continue;
+
+			// ... And starts
+			if (s == "[")
+				continue;
+
+			// else: statements are nops
+			if (s.find("else:") != std::string::npos)
+				continue;
+
+			// As is finally:
+			if (s.find("finally:") != std::string::npos)
+				continue;
+
+			// Single-line python strings (e.g., 'description of the function')
+			if (isPythonString(s))
+				continue;
+
+			size_t idx = multilineIdx(s);
+
+			switch (state)
+			{
+			case start:
+				if (idx != std::string::npos)
+				{
+					kcov_debug(ENGINE_MSG, "python multiline ON  %3d: %s\n", lineNo, s.c_str());
+
+					std::string s2 = s.substr(idx + 3, std::string::npos);
+
+					if (multilineIdx(s2) == std::string::npos)
+						state = multiline_active;
+					else
+						// Ends on the same line
+						break;
+
+					/*
+					 *  E.g.
+					 *
+					 *    a = '''yadayada [...]
+					 *    hejsan
+					 *    '''
+					 */
+					if (idx > 0)
+						multiLineStartLine = true;
+
+					// Don't report this line
+					continue;
+				}
+				break;
+			case multiline_active:
+				if (idx != std::string::npos)
+				{
+					kcov_debug(ENGINE_MSG, "python multiline OFF %3d: %s\n", lineNo, s.c_str());
+					state = start;
+
+					// The last line of a multi-line string will get reported by the
+					// python helper, so add this as a line if there was an assignment
+					// above
+					if (multiLineStartLine)
+					{
+						fileLineFound(crc, filename, lineNo);
+						multiLineStartLine = false;
+					}
+				}
+				continue; // Don't report this line
+			default:
+				panic("Unknown state %u", state);
+				break;
+			}
+
+			fileLineFound(crc, filename, lineNo);
+		}
+	}
+
+	size_t multilineIdx(const std::string &s)
+	{
+		size_t idx = s.find("'''");
+
+		if (idx == std::string::npos)
+			idx = s.find("\"\"\"");
+
+		return idx;
+	}
+
+	bool isStringDelimiter(char c)
+	{
+		return c == '\'' || c == '"';
+	}
+
+	bool isPythonString(const std::string &s)
+	{
+		if (s.size() < 2)
+			return false;
+
+		char first = s[0];
+		char last = s[s.size() - 1];
+
+		if (!isStringDelimiter(first))
+			return false;
+
+		// Can be multi-line string, handled elsewhere
+		if (!isStringDelimiter(last))
+			return false;
+
+		unsigned i;
+		for (i = 0; i < s.size(); i++)
+		{
+			if (!isStringDelimiter(s[i]))
+				break;
+		}
+		// Only string characters
+		if (i == s.size())
+			return false;
+
+		return true;
+	}
+
+	struct coverage_data *readCoverageDatum(uint8_t *buf, size_t totalSize)
+	{
+		struct coverage_data *p = (struct coverage_data *) buf;
+		ssize_t rv;
+
+		if (feof(m_pipe))
+			return NULL; // Not an error
+
+		// No data?
+		if (!file_readable(m_pipe, 100))
+			return NULL;
+
+		memset(buf, 0, sizeof(struct coverage_data));
+		rv = fread(buf, 1, sizeof(struct coverage_data), m_pipe);
+		if (rv == 0)
+			return NULL; // Not an error
+
+		if (rv < (int) sizeof(struct coverage_data))
+		{
+			error("Read too little %zd", rv);
+
+			return NULL;
+		}
+		unmarshalCoverageData(p);
+
+		bool valid = p->magic == COVERAGE_MAGIC && p->size < totalSize;
+
+		kcov_debug(ENGINE_MSG, "datum: 0x%16llx, size %u, line %u (%svalid)\n", (unsigned long long) p->magic,
+				(unsigned int) p->size, (unsigned int) p->line, valid ? "" : "in");
+
+		if (!valid)
+		{
+			uint32_t *p32 = (uint32_t *) buf;
+
+			error("Data magic wrong or size too large: %08x %08x %08x %08x\n", p32[0], p32[1], p32[2], p32[3]);
+
+			return NULL;
+		}
+
+		size_t remainder = p->size - sizeof(struct coverage_data);
+		rv = fread(buf + sizeof(struct coverage_data), 1, remainder, m_pipe);
+		if (rv < (ssize_t) remainder)
+		{
+			error("Read too little %zd vs %zu", rv, remainder);
+
+			return NULL;
+		}
+
+		return p;
+	}
+
+	pid_t m_child;
+	FILE *m_pipe;
+};
+
+// This ugly stuff should be fixed
+static PythonEngine *g_pythonEngine;
+class PythonCtor
+{
+public:
+	PythonCtor()
+	{
+		g_pythonEngine = new PythonEngine();
+	}
+};
+static PythonCtor g_pythonCtor;
+
+class PythonEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~PythonEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		return g_pythonEngine;
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		std::string s((const char *) data, 80);
+
+		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".py")
+			return 200;
+
+		if (s.find("python") != std::string::npos)
+			return 100;
+
+		return match_none;
+	}
+};
+
+static PythonEngineCreator g_pythonEngineCreator;
diff --git a/kcov-38/src/engines/python-helper.py b/kcov-38/src/engines/python-helper.py
new file mode 100644
index 000000000000..d19be6dfa2e8
--- /dev/null
+++ b/kcov-38/src/engines/python-helper.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+# Based on http://pymotw.com/2/sys/tracing.html, "Tracing a program as it runs"
+# and http://hg.python.org/cpython/file/2.7/Lib/trace.py
+
+import imp
+import sys
+import os
+import struct
+
+fifo_file = None
+report_trace_real = None
+
+try:
+    # In Py 2.x, the builtins were in __builtin__
+    BUILTINS = sys.modules['__builtin__']
+except KeyError:
+    # In Py 3.x, they're in builtins
+    BUILTINS = sys.modules['builtins']
+
+
+def report_trace3(file, line):
+    size = len(file) + 1 + 8 + 4 + 4
+    data = struct.pack(">QLL%dsb" % len(file), 0x6d6574616c6c6775, size, int(line), bytes(file, 'utf-8'), 0)
+
+    fifo_file.write(data)
+
+def report_trace2(file, line):
+    size = len(file) + 1 + 8 + 4 + 4
+    data = struct.pack(">QLL%dsb" % len(file), 0x6d6574616c6c6775, size, int(line), file, 0)
+
+    fifo_file.write(data)
+
+def report_trace(file, line):
+    try:
+        report_trace_real(file, line)
+        fifo_file.flush()
+    except:
+        # Ignore errors
+        pass
+
+def trace_lines(frame, event, arg):
+    if event != 'line':
+        return
+    co = frame.f_code
+    func_name = co.co_name
+    line_no = frame.f_lineno
+    filename = co.co_filename
+    report_trace(filename, line_no)
+
+def trace_calls(frame, event, arg):
+    if event != 'call':
+        return
+    co = frame.f_code
+    func_name = co.co_name
+    line_no = frame.f_lineno
+    filename = co.co_filename
+    report_trace(filename, line_no)
+    return trace_lines
+
+def runctx(cmd, globals):
+    sys.settrace(trace_calls)
+    try:
+        exec(cmd, globals)
+    finally:
+        sys.settrace(None)
+
+if __name__ == "__main__":
+    if sys.version_info >= (3, 0):
+        report_trace_real = report_trace3
+    else:
+        report_trace_real = report_trace2
+
+    prog_argv = sys.argv[1:]
+
+    sys.argv = prog_argv
+    progname = prog_argv[0]
+    sys.path[0] = os.path.split(progname)[0]
+
+    fifo_path = os.getenv("KCOV_PYTHON_PIPE_PATH")
+    if fifo_path == None:
+        sys.stderr.write("the KCOV_PYTHON_PIPE_PATH environment variable is not set")
+        sys.exit(127)
+    try:
+        fifo_file = open(fifo_path, "wb")
+    except:
+        sys.stderr.write("Can't open fifo file")
+        sys.exit(127)
+
+    main_mod = imp.new_module('__main__')
+    old_main_mod = sys.modules['__main__']
+    sys.modules['__main__'] = main_mod
+    main_mod.__file__ = progname
+    main_mod.__package__ = None
+    main_mod.__builtins__ = BUILTINS
+
+    try:
+        with open(progname) as fp:
+            # try to emulate __main__ namespace as much as possible
+
+            code = compile(fp.read(), progname, 'exec')
+
+            runctx(code, main_mod.__dict__)
+    except IOError:
+        sys.stderr.write("Cannot run file %r" % (sys.argv[0]))
+        sys.exit(127)
+    finally:
+        sys.modules['__main__'] = old_main_mod
diff --git a/kcov-38/src/engines/script-engine-base.hh b/kcov-38/src/engines/script-engine-base.hh
new file mode 100644
index 000000000000..d135b597c2dc
--- /dev/null
+++ b/kcov-38/src/engines/script-engine-base.hh
@@ -0,0 +1,117 @@
+#include <file-parser.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <lineid.hh>
+#include <utils.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+#include <list>
+#include <unordered_map>
+#include <vector>
+
+#include <swap-endian.hh>
+
+using namespace kcov;
+
+/**
+ * Base-class for script-based coverage engines.
+ */
+class ScriptEngineBase : public IEngine, public IFileParser
+{
+public:
+	ScriptEngineBase() :
+			m_listener(NULL)
+	{
+		IParserManager::getInstance().registerParser(*this);
+	}
+
+	virtual ~ScriptEngineBase()
+	{
+	}
+
+	// From IEngine
+	virtual int registerBreakpoint(unsigned long addr)
+	{
+		// No breakpoints
+		return 0;
+	}
+
+	// From IFileParser
+	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
+	{
+		return true;
+	}
+
+	virtual bool setMainFileRelocation(unsigned long relocation)
+	{
+		return true;
+	}
+
+	virtual void registerLineListener(ILineListener &listener)
+	{
+		m_lineListeners.push_back(&listener);
+	}
+
+	virtual void registerFileListener(IFileListener &listener)
+	{
+		m_fileListeners.push_back(&listener);
+	}
+
+	virtual bool parse()
+	{
+		return true;
+	}
+
+	virtual uint64_t getChecksum()
+	{
+		return 0;
+	}
+
+	virtual enum IFileParser::PossibleHits maxPossibleHits()
+	{
+		return IFileParser::HITS_UNLIMITED;
+	}
+
+	virtual void setupParser(IFilter *filter)
+	{
+	}
+
+protected:
+	void reportEvent(enum event_type type, int data = -1, uint64_t address = 0)
+	{
+		if (!m_listener)
+			return;
+
+		m_listener->onEvent(Event(type, data, address));
+	}
+
+	void fileLineFound(uint32_t crc, const std::string &filename, unsigned int lineNo)
+	{
+		uint64_t id = getLineId(filename, lineNo);
+		uint64_t address = (uint64_t) crc | ((uint64_t) lineNo << 32ULL);
+
+		m_lineIdToAddress[id] = address;
+
+		for (LineListenerList_t::const_iterator lit = m_lineListeners.begin(); lit != m_lineListeners.end(); ++lit)
+			(*lit)->onLine(get_real_path(filename).c_str(), lineNo, address);
+	}
+
+	typedef std::vector<ILineListener *> LineListenerList_t;
+	typedef std::vector<IFileListener *> FileListenerList_t;
+	typedef std::unordered_map<std::string, bool> ReportedFileMap_t;
+	typedef std::unordered_map<uint64_t, uint64_t> LineIdToAddressMap_t;
+
+	LineListenerList_t m_lineListeners;
+	FileListenerList_t m_fileListeners;
+	ReportedFileMap_t m_reportedFiles;
+	LineIdToAddressMap_t m_lineIdToAddress;
+
+	IEventListener *m_listener;
+};
diff --git a/kcov-38/src/engines/system-mode-binary-lib.cc b/kcov-38/src/engines/system-mode-binary-lib.cc
new file mode 100644
index 000000000000..5aa13064ad0c
--- /dev/null
+++ b/kcov-38/src/engines/system-mode-binary-lib.cc
@@ -0,0 +1,86 @@
+#include <sys/types.h>
+#include <time.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <utils.hh>
+
+#include <system-mode/registration.hh>
+
+void connectToDaemon(void) __attribute__((constructor));
+
+void connectToDaemon(void)
+{
+	std::string destinationPipe = "/tmp/kcov-system.pipe";
+	std::string outputDir = "/tmp/kcov-data/";
+
+	const char *pipePathEnv = getenv("KCOV_SYSTEM_PIPE");
+	const char *outputDirEnv = getenv("KCOV_SYSTEM_DESTINATION_DIR");
+
+	if (pipePathEnv)
+	{
+		destinationPipe = pipePathEnv;
+	}
+	if (outputDirEnv)
+	{
+		outputDir = outputDirEnv;
+	}
+
+	struct stat st;
+
+	if (lstat(destinationPipe.c_str(), &st) != 0)
+	{
+		fprintf(stderr, "kcov-system-lib: Pipe %s doesn't exist. Giving up\n", destinationPipe.c_str());
+		return;
+	}
+
+
+	char buf[4096];
+	memset(buf, 0, sizeof(buf));
+	int rv = readlink("/proc/self/exe", buf, sizeof(buf));
+
+	if (rv < 0)
+	{
+		fprintf(stderr, "kcov-system-lib: Can't read /proc/self/exe link\n");
+		return;
+	}
+	buf[sizeof(buf) - 1] = '\0';
+	std::string filename = buf;
+
+
+	// Used to make sure the process waits here until the daemon has attached
+	std::string readbackPipe = fmt("%s/%d", outputDir.c_str(), getpid());
+
+	if (::mkfifo(readbackPipe.c_str(), 0644) < 0)
+	{
+		fprintf(stderr, "kcov-system-lib: Can't create readback pipe\n");
+		return;
+	}
+
+	struct new_process_entry *pe = createProcessEntry(getpid(), filename);
+
+	if (write_file(pe, pe->entry_size, "%s", destinationPipe.c_str()) >= 0)
+	{
+		int fd = open(readbackPipe.c_str(), O_RDONLY);
+		if (fd < 0)
+		{
+			unlink(readbackPipe.c_str());
+			return;
+		}
+
+		// Block until something exists
+		rv = read(fd, buf, sizeof(buf));
+
+		if (rv < 0)
+		{
+			fprintf(stderr, "kcov-system-lib: Warning: Read-back returned error?\n");
+		}
+
+		close(fd);
+		unlink(readbackPipe.c_str());
+	}
+	free((void *)pe);
+}
diff --git a/kcov-38/src/engines/system-mode-engine.cc b/kcov-38/src/engines/system-mode-engine.cc
new file mode 100644
index 000000000000..2406cb949adc
--- /dev/null
+++ b/kcov-38/src/engines/system-mode-engine.cc
@@ -0,0 +1,267 @@
+#include <file-parser.hh>
+#include <engine.hh>
+#include <configuration.hh>
+#include <output-handler.hh>
+#include <utils.hh>
+#include <generated-data-base.hh>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/param.h>
+#include <signal.h>
+
+#include <list>
+#include <unordered_map>
+#include <vector>
+#include <utility>
+
+#include <system-mode/file-data.hh>
+
+#include "system-mode-file-format.hh"
+
+using namespace kcov;
+
+class SystemModeEngine : public IEngine
+{
+public:
+	enum mode
+	{
+		mode_unset,
+		mode_write_file,
+		mode_read_file,
+	};
+
+
+	SystemModeEngine(enum mode mode) :
+		m_mode(mode),
+		m_listener(NULL),
+		m_breakpointIdx(0)
+	{
+	}
+
+	int registerBreakpoint(unsigned long addr)
+	{
+		m_indexToAddress.push_back(addr);
+		m_breakpointIdx++;
+
+		return m_breakpointIdx - 1;
+	}
+
+	bool start(IEventListener &listener, const std::string &executable)
+	{
+		m_filename = executable;
+		m_listener = &listener;
+
+		return true;
+	}
+
+	void kill(int sig)
+	{
+		// Not applicable
+	}
+
+	bool continueExecution()
+	{
+		size_t sz;
+		void *p = read_file(&sz, "%s", m_filename.c_str());
+
+		if (!p)
+		{
+			error("Can't read file %s\n", m_filename.c_str());
+			return false;
+		}
+		uint32_t checksum = hash_block(p, sz);
+
+		if (m_mode == mode_write_file)
+		{
+			handleWriter(p, sz, checksum);
+		}
+		else if (m_mode == mode_read_file)
+		{
+			handleReadFile();
+		}
+		else
+		{
+			panic("Unknown mode??? Check implementation\n");
+		}
+		free(p);
+
+		// Nothing to do after this
+		reportEvent(ev_exit, 0, 0);
+
+		return false;
+	}
+
+private:
+	void handleWriter(void *p, size_t sz, uint32_t checksum)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		std::string options = getKcovOptionsString();
+		struct stat st;
+
+		if (stat(m_filename.c_str(), &st) < 0)
+		{
+			error("Can't read input file %s\n", m_filename.c_str());
+			return;
+		}
+
+		SystemModeFile *sysFile = SystemModeFile::fromRawFile(checksum, m_filename, options.c_str(), p, sz);
+		if (!sysFile)
+		{
+			error("Can't create sys file\n");
+			return;
+		}
+
+		uint32_t idx = 0;
+		for (std::vector<uint64_t>::iterator it = m_indexToAddress.begin();
+				it != m_indexToAddress.end();
+				++it, ++idx)
+		{
+			sysFile->addEntry(idx, *it);
+		}
+
+		std::string dst = conf.keyAsString("system-mode-write-file");
+
+		size_t processedSize;
+		const void *data = sysFile->getProcessedData(processedSize);
+
+		if (data)
+		{
+			write_file(data, processedSize, "%s", dst.c_str());
+			if (chmod(dst.c_str(), st.st_mode) < 0)
+			{
+				error("Can't chmod???\n");
+			}
+		}
+
+		free((void *)data);
+
+		std::string patchelf = conf.keyAsString("patchelf-command");
+		std::string lib = "libkcov_system.so";
+		std::string cmd = fmt("%s --add-needed %s %s", patchelf.c_str(), lib.c_str(), dst.c_str());
+
+		// FIXME! Check if patchelf exists
+
+		int rv = system(cmd.c_str());
+		if (WEXITSTATUS(rv) != 0)
+		{
+			error("patchelf command error %d\n", rv);
+		}
+
+		delete sysFile;
+	}
+
+	void handleReadFile()
+	{
+		std::string src = IConfiguration::getInstance().keyAsString("system-mode-read-results-file");
+
+		kcov_system_mode::system_mode_memory *results = kcov_system_mode::diskToMemory(src);
+
+		if (!results)
+		{
+			return;
+		}
+
+		for (unsigned i = 0; i < results->n_entries * 32; i++) // 32 bits per entry
+		{
+			if (results->indexIsHit(i))
+			{
+				reportEvent(ev_breakpoint, 0, m_indexToAddress[i]);
+			}
+		}
+
+		delete results;
+	}
+
+	std::string getKcovOptionsString()
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		return fmt("%s %s %s %s %s %s ",
+				keyListAsString(conf.keyAsList("include-pattern")).c_str(),
+				keyListAsString(conf.keyAsList("exclude-pattern")).c_str(),
+				keyListAsString(conf.keyAsList("include-path")).c_str(),
+				keyListAsString(conf.keyAsList("exclude-path")).c_str(),
+				conf.keyAsString("exclude-line").c_str(),
+				conf.keyAsString("exclude-region").c_str());
+	}
+
+	std::string keyListAsString(const std::vector<std::string> &list)
+	{
+		std::string out;
+
+		if (list.empty())
+		{
+			return "";
+		}
+
+		for (std::vector<std::string>::const_iterator it = list.begin();
+				it != list.end();
+				++it)
+		{
+			out = out + *it + ",";
+		}
+		out = out.substr(0, out.size() - 1); // Remove last ,
+
+		return out;
+	}
+
+	void reportEvent(enum event_type type, int data = -1, uint64_t address = 0)
+	{
+		if (!m_listener)
+			return;
+
+		m_listener->onEvent(Event(type, data, address));
+	}
+
+	const enum mode m_mode;
+
+	IEngine::IEventListener *m_listener;
+	uint32_t m_breakpointIdx;
+
+	std::vector<uint64_t> m_indexToAddress;
+	std::string m_filename;
+};
+
+
+// This ugly stuff was again inherited from bashEngine
+class SystemModeEngineCreator : public IEngineFactory::IEngineCreator
+{
+public:
+	virtual ~SystemModeEngineCreator()
+	{
+	}
+
+	virtual IEngine *create()
+	{
+		SystemModeEngine::mode mode = SystemModeEngine::mode_read_file;
+
+		if (IConfiguration::getInstance().keyAsString("system-mode-write-file") != "")
+		{
+			mode = SystemModeEngine::mode_write_file;
+		}
+
+		return new SystemModeEngine(mode);
+	}
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		if (conf.keyAsString("system-mode-write-file") != "" ||
+				conf.keyAsString("system-mode-read-results-file") != "")
+		{
+			return match_perfect;
+		}
+
+		return match_none;
+	}
+
+private:
+	std::string m_filename;
+};
+
+static SystemModeEngineCreator g_systemModeEngineCreator;
diff --git a/kcov-38/src/engines/system-mode-file-format.cc b/kcov-38/src/engines/system-mode-file-format.cc
new file mode 100644
index 000000000000..1a4c8afbb400
--- /dev/null
+++ b/kcov-38/src/engines/system-mode-file-format.cc
@@ -0,0 +1,125 @@
+#include "system-mode-file-format.hh"
+
+#include <utils.hh>
+
+struct kcov_system_mode::system_mode_file *kcov_system_mode::memoryToFile(const class kcov_system_mode::system_mode_memory &mem, size_t &outSize)
+{
+	outSize = sizeof(struct system_mode_file) + mem.n_entries * sizeof(uint32_t) +
+			mem.filename.size() + mem.options.size() + 2;
+	struct system_mode_file *out = (struct system_mode_file *)xmalloc(outSize);
+	char *p = (char *)out;
+
+	out->magic = SYSTEM_MODE_FILE_MAGIC;
+	out->version = SYSTEM_MODE_FILE_VERSION;
+	out->n_entries = mem.n_entries;
+	out->filename_offset = mem.n_entries * sizeof(uint32_t) + sizeof(*out);
+	out->kcov_options_offset = out->filename_offset + mem.filename.size() + 1;
+
+	strcpy(&p[out->filename_offset], mem.filename.c_str());
+	strcpy(&p[out->kcov_options_offset], mem.options.c_str());
+
+	memcpy(out->data, mem.data, out->n_entries * sizeof(uint32_t));
+
+	return out;
+}
+
+class kcov_system_mode::system_mode_memory *kcov_system_mode::fileToMemory(const struct kcov_system_mode::system_mode_file &file)
+{
+	if (file.magic != SYSTEM_MODE_FILE_MAGIC)
+	{
+		return NULL;
+	}
+
+	if (file.version != SYSTEM_MODE_FILE_VERSION)
+	{
+		return NULL;
+	}
+
+	size_t sizeExceptStrings = sizeof(file) + file.n_entries * sizeof(uint32_t);
+
+	if (file.filename_offset < sizeExceptStrings)
+	{
+		return NULL;
+	}
+
+	if (file.kcov_options_offset < file.filename_offset + 1)
+	{
+		return NULL;
+	}
+	char *p = (char *)&file;
+
+	kcov_system_mode::system_mode_memory *out = new kcov_system_mode::system_mode_memory(std::string(&p[file.filename_offset]),
+			std::string(&p[file.kcov_options_offset]),
+			file.n_entries);
+
+	memcpy(out->data, file.data, out->n_entries * sizeof(uint32_t));
+
+	return out;
+}
+
+class kcov_system_mode::system_mode_memory *kcov_system_mode::diskToMemory(const std::string &src)
+{
+	size_t sz;
+	kcov_system_mode::system_mode_file *p = (kcov_system_mode::system_mode_file *)read_file(&sz, "%s", src.c_str());
+
+	if (!p)
+	{
+		return NULL;
+	}
+
+	kcov_system_mode::system_mode_memory *out = kcov_system_mode::fileToMemory(*p);
+	free(p);
+
+	return out;
+}
+
+bool kcov_system_mode::system_mode_memory::indexIsHit(uint32_t index) const
+{
+	if (index / 32 >= n_entries)
+	{
+		return false;
+	}
+
+	uint32_t cur = data[index / 32];
+	uint32_t bit = index % 32;
+
+	return !!(cur & (1 << bit));
+}
+
+void kcov_system_mode::system_mode_memory::reportIndex(uint32_t index)
+{
+	unsigned int wordIdx = index / 32;
+	unsigned int bit = index % 32;
+
+	if (wordIdx >= n_entries)
+	{
+		return;
+	}
+
+	// Update the bit atomically
+	uint32_t *p = &data[wordIdx];
+
+	// Already hit?
+	if (*p & (1 << bit))
+		return;
+
+	uint32_t val, newVal;
+	do
+	{
+		val = *p;
+		newVal = val | (1 << bit);
+
+	} while (!__sync_bool_compare_and_swap(p, val, newVal));
+
+	__sync_fetch_and_add(dirtyCount, 1);
+}
+
+bool kcov_system_mode::system_mode_memory::isDirty() const
+{
+	return *dirtyCount != *cleanCount;
+}
+
+void kcov_system_mode::system_mode_memory::markClean()
+{
+	*cleanCount = *dirtyCount;
+}
diff --git a/kcov-38/src/engines/system-mode-file-format.hh b/kcov-38/src/engines/system-mode-file-format.hh
new file mode 100644
index 000000000000..034557bdcad2
--- /dev/null
+++ b/kcov-38/src/engines/system-mode-file-format.hh
@@ -0,0 +1,86 @@
+#pragma once
+
+#include <stdint.h>
+#include <string>
+#include <sys/mman.h>
+
+#include <utils.hh>
+
+const uint32_t SYSTEM_MODE_FILE_MAGIC = 0x4d455247; // "MERG"
+const uint32_t SYSTEM_MODE_FILE_VERSION = 1;
+
+namespace kcov_system_mode
+{
+	struct system_mode_file
+	{
+		uint32_t magic;
+		uint32_t version;
+		uint32_t n_entries;
+		uint32_t header_checksum;
+		uint32_t filename_offset;
+		uint32_t kcov_options_offset; // --include-pattern etc
+		uint32_t data[];
+	};
+
+	class system_mode_memory
+	{
+	public:
+		system_mode_memory(const std::string &fn, const std::string &opts, uint32_t n) :
+			filename(fn),
+			options(opts),
+			n_entries(n)
+		{
+			mapped = true;
+			data = (uint32_t *)::mmap(NULL, (n_entries + 2) * sizeof(uint32_t), PROT_READ | PROT_WRITE,
+					MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+			if (!data)
+			{
+				// Fallback to plain malloc - won't work with forks
+				data = (uint32_t *)xmalloc((n_entries + 2) * sizeof(uint32_t));
+			}
+
+			dirtyCount = &data[n_entries];
+			cleanCount = &data[n_entries + 1];
+
+			*dirtyCount = 0;
+			*cleanCount = 0;
+		}
+
+		~system_mode_memory()
+		{
+			if (mapped)
+			{
+				munmap(data, n_entries * sizeof(uint32_t));
+			}
+			else
+			{
+				free(data);
+			}
+		}
+
+		void reportIndex(uint32_t index);
+
+		bool indexIsHit(uint32_t index) const;
+
+		bool isDirty() const;
+
+		void markClean();
+
+		const std::string filename;
+		const std::string options;
+		const uint32_t n_entries;
+		uint32_t *data;
+
+		uint32_t *dirtyCount;
+		uint32_t *cleanCount;
+
+	private:
+		bool mapped;
+	};
+
+	struct system_mode_file *memoryToFile(const class system_mode_memory &mem, size_t &outSize);
+
+	class system_mode_memory *fileToMemory(const struct system_mode_file &file);
+
+	class system_mode_memory *diskToMemory(const std::string &src);
+};
diff --git a/kcov-38/src/filter.cc b/kcov-38/src/filter.cc
new file mode 100644
index 000000000000..ed2736908aa7
--- /dev/null
+++ b/kcov-38/src/filter.cc
@@ -0,0 +1,362 @@
+#include <filter.hh>
+#include <configuration.hh>
+#include <utils.hh>
+
+#include <limits.h>
+#include <stdlib.h>
+#include <string>
+#include <vector>
+
+using namespace kcov;
+
+class BasicFilter : public IFilter
+{
+public:
+	BasicFilter()
+	{
+		m_fileLineHandler = new FileLineHandler();
+	}
+
+	~BasicFilter()
+	{
+		delete m_fileLineHandler;
+	}
+
+	// Allow anything
+	virtual bool runFilters(const std::string &file)
+	{
+		return true;
+	}
+
+	virtual bool runLineFilters(const std::string &filePath,
+			unsigned int lineNr, const std::string &line)
+	{
+		return m_fileLineHandler->match(filePath, lineNr, line);
+	}
+
+	virtual std::string mangleSourcePath(const std::string &path)
+	{
+		return path;
+	}
+
+protected:
+	class FileLineHandler
+	{
+	public:
+		FileLineHandler()
+		{
+			m_lineBeginPatterns.push_back("LCOV_EXCL_START");
+			m_lineEndPatterns.push_back("LCOV_EXCL_STOP");
+
+			m_ignoreSingleLinePatterns.push_back("LCOV_EXCL_LINE");
+			m_ignoreSingleLinePatterns.push_back("#[should_panic]");
+
+			// Handle command line options
+			std::string cmd = IConfiguration::getInstance().keyAsString(
+					"exclude-line");
+
+			if (cmd != "")
+			{
+				std::vector<std::string> cmds = split_string(cmd, ",");
+
+				for (std::vector<std::string>::iterator it = cmds.begin();
+						it != cmds.end(); ++it)
+					m_ignoreSingleLinePatterns.push_back(*it);
+			}
+
+			std::string startStop = IConfiguration::getInstance().keyAsString(
+					"exclude-region");
+
+			if (startStop != "")
+			{
+				std::vector<std::string> cmds = split_string(startStop, ",");
+
+				for (std::vector<std::string>::iterator it = cmds.begin();
+						it != cmds.end(); ++it)
+				{
+					std::vector<std::string> entries = split_string(*it, ":");
+
+					if (entries.size() >= 1)
+						m_lineBeginPatterns.push_back(entries[0]);
+					if (entries.size() > 1)
+						m_lineEndPatterns.push_back(entries[1]);
+
+				}
+			}
+
+			m_excludeStart = 0;
+		}
+
+		bool match(const std::string &filePath, unsigned int lineNr,
+				const std::string &line)
+		{
+			bool out = true;
+
+			// Source file swapped
+			if (m_curFile != filePath)
+			{
+				m_excludeStart = 0;
+				m_curFile = filePath;
+			}
+
+			for (std::vector<std::string>::iterator it =
+					m_ignoreSingleLinePatterns.begin();
+					it != m_ignoreSingleLinePatterns.end(); ++it)
+			{
+				if (line.find(*it) != std::string::npos)
+					out = false;
+			}
+
+			for (std::vector<std::string>::iterator it =
+					m_lineBeginPatterns.begin();
+					it != m_lineBeginPatterns.end(); ++it)
+			{
+				if (line.find(*it) != std::string::npos)
+				{
+					m_excludeStart++;
+					break;
+				}
+			}
+
+			// The line including the stop should be covered
+			if (m_excludeStart > 0)
+				out = false;
+
+			for (std::vector<std::string>::iterator it =
+					m_lineEndPatterns.begin(); it != m_lineEndPatterns.end();
+					++it)
+			{
+				if (line.find(*it) != std::string::npos)
+				{
+					m_excludeStart--;
+					break;
+				}
+			}
+
+			// Ignore multiple stops
+			if (m_excludeStart < 0)
+				m_excludeStart = 0;
+
+			return out;
+		}
+
+	private:
+		std::string m_curFile;
+		std::vector<std::string> m_ignoreSingleLinePatterns;
+
+		std::vector<std::string> m_lineBeginPatterns;
+		std::vector<std::string> m_lineEndPatterns;
+		int m_excludeStart;
+	};
+
+	FileLineHandler *m_fileLineHandler;
+};
+
+class Filter: public BasicFilter
+{
+public:
+	Filter()
+	{
+		m_patternHandler = new PatternHandler();
+		m_pathHandler = new PathHandler();
+
+		m_origRoot = IConfiguration::getInstance().keyAsString(
+				"orig-path-prefix");
+		m_newRoot = IConfiguration::getInstance().keyAsString(
+				"new-path-prefix");
+	}
+
+	~Filter()
+	{
+		delete m_patternHandler;
+		delete m_pathHandler;
+	}
+
+	// Used by the unit test
+	void setup()
+	{
+		delete m_fileLineHandler;
+		delete m_patternHandler;
+		delete m_pathHandler;
+		m_patternHandler = new PatternHandler();
+		m_pathHandler = new PathHandler();
+		m_fileLineHandler = new FileLineHandler();
+	}
+
+	bool runFilters(const std::string &file)
+	{
+		bool out = true;
+
+		if (m_pathHandler->isSetup())
+			out = m_pathHandler->includeFile(file);
+
+		if (out && m_patternHandler->isSetup())
+			return m_patternHandler->includeFile(file);
+
+		return out;
+	}
+
+	std::string mangleSourcePath(const std::string &path)
+	{
+		std::string filename = get_real_path(path);
+
+		if (m_origRoot.length() > 0 && m_newRoot.length() > 0)
+		{
+			std::string path = filename;
+			size_t index = path.find(m_origRoot);
+
+			if (index != std::string::npos)
+			{
+				path.replace(index, m_origRoot.length(), m_newRoot);
+				filename = get_real_path(path);
+			}
+		}
+
+		return filename;
+	}
+
+private:
+	class PatternHandler
+	{
+	public:
+		PatternHandler() :
+				m_includePatterns(
+						IConfiguration::getInstance().keyAsList(
+								"include-pattern")), m_excludePatterns(
+						IConfiguration::getInstance().keyAsList(
+								"exclude-pattern"))
+		{
+		}
+
+		bool isSetup()
+		{
+			return !(m_includePatterns.size() == 0
+					&& m_excludePatterns.size() == 0);
+		}
+
+		bool includeFile(std::string file)
+		{
+			if (m_includePatterns.size() == 0 && m_excludePatterns.size() == 0)
+				return true;
+
+			bool out = true;
+
+			if (m_includePatterns.size() != 0)
+				out = false;
+
+			for (PatternMap_t::const_iterator it = m_includePatterns.begin();
+					it != m_includePatterns.end(); ++it)
+			{
+				const std::string &pattern = *it;
+
+				if (file.find(pattern) != std::string::npos)
+					out = true;
+			}
+
+			for (PatternMap_t::const_iterator it = m_excludePatterns.begin();
+					it != m_excludePatterns.end(); ++it)
+			{
+				const std::string &pattern = *it;
+
+				if (file.find(pattern) != std::string::npos)
+					out = false;
+			}
+
+			return out;
+		}
+	private:
+		typedef std::vector<std::string> PatternMap_t;
+
+		const PatternMap_t &m_includePatterns;
+		const PatternMap_t &m_excludePatterns;
+	};
+
+	class PathHandler
+	{
+	public:
+		PathHandler() :
+				m_includePaths(
+						IConfiguration::getInstance().keyAsList(
+								"include-path")), m_excludePaths(
+						IConfiguration::getInstance().keyAsList("exclude-path"))
+		{
+			for (PathMap_t::iterator it = m_includePaths.begin();
+					it != m_includePaths.end(); ++it)
+				*it = get_real_path(*it);
+
+			for (PathMap_t::iterator it = m_excludePaths.begin();
+					it != m_excludePaths.end(); ++it)
+				*it = get_real_path(*it);
+		}
+
+		bool isSetup()
+		{
+			return !(m_includePaths.size() == 0 && m_excludePaths.size() == 0);
+		}
+
+		bool includeFile(const std::string &file)
+		{
+			if (m_includePaths.size() == 0 && m_excludePaths.size() == 0)
+				return true;
+
+			bool out = true;
+
+			if (m_includePaths.size() != 0)
+				out = false;
+
+			const std::string pathStr = get_real_path(file);
+
+			// If found in --include-path=, accept this path
+			for (PathMap_t::const_iterator it = m_includePaths.begin();
+					it != m_includePaths.end(); ++it)
+			{
+				const std::string &pathPattern = *it;
+				size_t last = pathPattern.size();
+
+				if (pathStr.find(pathPattern) == 0
+						&& (pathStr.size() <= last || pathStr[last] == '/'))
+				{
+					out = true;
+					break;
+				}
+			}
+
+			// ... unless it's found in --exclude-path=.
+			for (PathMap_t::const_iterator it = m_excludePaths.begin();
+					it != m_excludePaths.end(); ++it)
+			{
+				const std::string &pathPattern = *it;
+				size_t last = pathPattern.size();
+
+				if (pathStr.find(pathPattern) == 0
+						&& (pathStr.size() <= last || pathStr[last] == '/'))
+				{
+					out = false;
+					break;
+				}
+			}
+
+			return out;
+		}
+	private:
+		typedef std::vector<std::string> PathMap_t;
+
+		PathMap_t m_includePaths;
+		PathMap_t m_excludePaths;
+	};
+
+	PatternHandler *m_patternHandler;
+	PathHandler *m_pathHandler;
+	std::string m_origRoot;
+	std::string m_newRoot;
+};
+
+IFilter &IFilter::create()
+{
+	return *new Filter();
+}
+
+IFilter &IFilter::createBasic()
+{
+	return *new BasicFilter();
+}
diff --git a/kcov-38/src/gcov.cc b/kcov-38/src/gcov.cc
new file mode 100644
index 000000000000..eeed786382b4
--- /dev/null
+++ b/kcov-38/src/gcov.cc
@@ -0,0 +1,409 @@
+#include <gcov.hh>
+#include <utils.hh>
+
+using namespace kcov;
+
+/*
+ * From gcov-io.h:
+ *
+ *  int32:  byte3 byte2 byte1 byte0 | byte0 byte1 byte2 byte3
+ *  int64:  int32:low int32:high
+ *  string: int32:0 | int32:length char* char:0 padding
+ *  padding: | char:0 | char:0 char:0 | char:0 char:0 char:0
+ *  item: int32 | int64 | string
+ *
+ * File:
+ *  file : int32:magic int32:version int32:stamp record*
+ *
+ * Record:
+ *  record: header data
+ *  header: int32:tag int32:length
+ *  data: item*
+ *
+ * gcno file records:
+ *  note: unit function-graph*
+ *  unit: header int32:checksum string:source
+ *  function-graph: announce_function basic_blocks {arcs | lines}*
+ *  announce_function: header int32:ident
+ *    int32:lineno_checksum int32:cfg_checksum
+ *    string:name string:source int32:lineno
+ *  basic_block: header int32:flags*
+ *  arcs: header int32:block_no arc*
+ *  arc:  int32:dest_block int32:flags
+ *  lines: header int32:block_no line*
+ *    int32:0 string:NULL
+ *  line:  int32:line_no | int32:0 string:filename
+ *
+ * gcda file records:
+ *   data: {unit summary:object summary:program* function-data*}*
+ *   unit: header int32:checksum
+ *   function-data:	announce_function present counts
+ *   announce_function: header int32:ident
+ *       int32:lineno_checksum int32:cfg_checksum
+ *   present: header int32:present
+ *   counts: header int64:count*
+ *   summary: int32:checksum {count-summary}GCOV_COUNTERS_SUMMABLE
+ *   count-summary:	int32:num int32:runs int64:sum
+ *      int64:max int64:sum_max histogram
+ *   histogram: {int32:bitvector}8 histogram-buckets*
+ *     histogram-buckets: int32:num int64:min int64:sum
+ */
+#define GCOV_DATA_MAGIC ((uint32_t)0x67636461) /* "gcda" */
+#define GCOV_NOTE_MAGIC ((uint32_t)0x67636e6f) /* "gcno" */
+
+#define GCOV_TAG_FUNCTION	 ((uint32_t)0x01000000)
+#define GCOV_TAG_FUNCTION_LENGTH (3)
+#define GCOV_TAG_BLOCKS		 ((uint32_t)0x01410000)
+#define GCOV_TAG_BLOCKS_LENGTH(NUM) (NUM)
+#define GCOV_TAG_BLOCKS_NUM(LENGTH) (LENGTH)
+#define GCOV_TAG_ARCS		 ((uint32_t)0x01430000)
+#define GCOV_TAG_ARCS_LENGTH(NUM)  (1 + (NUM) * 2)
+#define GCOV_TAG_ARCS_NUM(LENGTH)  (((LENGTH) - 1) / 2)
+#define GCOV_TAG_LINES		 ((uint32_t)0x01450000)
+#define GCOV_TAG_COUNTER_BASE 	 ((uint32_t)0x01a10000)
+#define GCOV_TAG_COUNTER_LENGTH(NUM) ((NUM) * 2)
+#define GCOV_TAG_COUNTER_NUM(LENGTH) ((LENGTH) / 2)
+#define GCOV_TAG_OBJECT_SUMMARY  ((uint32_t)0xa1000000) /* Obsolete */
+#define GCOV_TAG_PROGRAM_SUMMARY ((uint32_t)0xa3000000)
+#define GCOV_TAG_SUMMARY_LENGTH(NUM)  \
+        (1 + GCOV_COUNTERS_SUMMABLE * (10 + 3 * 2) + (NUM) * 5)
+#define GCOV_TAG_AFDO_FILE_NAMES ((uint32_t)0xaa000000)
+#define GCOV_TAG_AFDO_FUNCTION ((uint32_t)0xac000000)
+#define GCOV_TAG_AFDO_WORKING_SET ((uint32_t)0xaf000000)
+
+/* Arc flags */
+#define GCOV_ARC_ON_TREE 	 (1 << 0)
+#define GCOV_ARC_FAKE		 (1 << 1)
+#define GCOV_ARC_FALLTHROUGH (1 << 2)
+
+struct file_header
+{
+	int32_t magic;
+	int32_t version;
+	int32_t stamp;
+};
+
+struct header
+{
+	int32_t tag;
+	int32_t length;
+};
+
+GcovParser::GcovParser(const uint8_t *data, size_t dataSize) :
+		m_data(data), m_dataSize(dataSize)
+{
+}
+
+GcovParser::~GcovParser()
+{
+	free((void *) m_data);
+}
+
+bool GcovParser::parse()
+{
+	// Not a gcov file?
+	if (!verify())
+		return false;
+
+	const uint8_t *cur = m_data + sizeof(struct file_header);
+	ssize_t left = (ssize_t) (m_dataSize - sizeof(struct file_header));
+
+	// Iterate through the headers
+	while (1)
+	{
+		const struct header *header = (struct header *) cur;
+
+		if (!onRecord(header, cur + sizeof(*header)))
+			return false;
+
+		size_t curLen = sizeof(struct header) + header->length * 4;
+		left -= curLen;
+
+		if (left <= 0)
+			break;
+
+		cur += curLen;
+	}
+
+	return true;
+}
+
+bool GcovParser::verify()
+{
+	const struct file_header *header = (const struct file_header *) m_data;
+
+	if (header->magic != GCOV_DATA_MAGIC && header->magic != GCOV_NOTE_MAGIC)
+		return false;
+
+	return true;
+}
+
+const uint8_t *GcovParser::readString(const uint8_t *p, std::string &out)
+{
+	int32_t length = *(const int32_t*) p;
+	const char *c_str = (const char *) &p[4];
+
+	out = std::string(c_str);
+
+	return padPointer(p + length * 4 + 4); // Including the length field
+}
+
+// Convenience when using 32-bit pointers
+const int32_t *GcovParser::readString(const int32_t *p, std::string &out)
+{
+	return (const int32_t *) readString((const uint8_t *) p, out);
+}
+
+const uint8_t *GcovParser::padPointer(const uint8_t *p)
+{
+	unsigned long addr = (unsigned long) p;
+
+	if ((addr & 3) != 0)
+		p += 4 - (addr & 3);
+
+	return p;
+}
+
+GcnoParser::BasicBlockMapping::BasicBlockMapping(const BasicBlockMapping &other) :
+		m_function(other.m_function), m_basicBlock(other.m_basicBlock),
+		m_file(other.m_file), m_line(other.m_line), m_index(other.m_index)
+{
+}
+
+GcnoParser::BasicBlockMapping::BasicBlockMapping(int32_t function,
+		int32_t basicBlock, const std::string &file, int32_t line,
+		int32_t index) :
+		m_function(function), m_basicBlock(basicBlock), m_file(file), m_line(line), m_index(index)
+{
+}
+
+GcnoParser::Arc::Arc(const Arc &other) :
+		m_function(other.m_function), m_srcBlock(other.m_srcBlock), m_dstBlock(
+				other.m_dstBlock)
+{
+}
+
+GcnoParser::Arc::Arc(int32_t function, int32_t srcBlock, int32_t dstBlock) :
+		m_function(function), m_srcBlock(srcBlock), m_dstBlock(dstBlock)
+{
+}
+
+GcnoParser::GcnoParser(const uint8_t *data, size_t dataSize) :
+		GcovParser(data, dataSize), m_functionId(-1)
+{
+}
+
+const GcnoParser::BasicBlockList_t &GcnoParser::getBasicBlocks()
+{
+	return m_basicBlocks;
+}
+
+const GcnoParser::FunctionList_t &GcnoParser::getFunctions()
+{
+	return m_functions;
+}
+
+const GcnoParser::ArcList_t &GcnoParser::getArcs()
+{
+	return m_arcs;
+}
+
+bool GcnoParser::onRecord(const struct header *header, const uint8_t *data)
+{
+	kcov_debug(ENGINE_MSG, "GCNO record: 0x%08x (%d bytes)\n", header->tag,
+			header->length * 4);
+
+	switch (header->tag)
+	{
+	case GCOV_TAG_FUNCTION:
+		onAnnounceFunction(header, data);
+		break;
+	case GCOV_TAG_BLOCKS:
+		onBlocks(header, data);
+		break;
+	case GCOV_TAG_LINES:
+		onLines(header, data);
+		break;
+	case GCOV_TAG_ARCS:
+		onArcs(header, data);
+		break;
+	default:
+		break;
+	}
+
+	return true;
+}
+
+void GcnoParser::onAnnounceFunction(const struct header *header,
+		const uint8_t *data)
+{
+	const int32_t *p32 = (const int32_t *) data;
+	const uint8_t *p8 = data;
+	int32_t ident = p32[0];
+
+	p8 = readString(p8 + 3 * 4, m_function);
+	p8 = readString(p8, m_file);
+	m_functionId = ident;
+
+	m_functions.push_back(m_functionId);
+
+	kcov_debug(ENGINE_MSG, "GCNO function %d: %s\n", m_functionId,
+			m_file.c_str());
+	// The first line of this function comes next, but let's ignore that
+}
+
+void GcnoParser::onBlocks(const struct header *header, const uint8_t *data)
+{
+	// Not used by kcov
+}
+
+void GcnoParser::onLines(const struct header *header, const uint8_t *data)
+{
+	const int32_t *p32 = (const int32_t *) data;
+	int32_t blockNo = p32[0];
+	const int32_t *last = &p32[header->length];
+	int32_t n = 0; // index
+
+	p32++; // Skip blockNo
+
+	// Iterate through lines
+	while (p32 < last)
+	{
+		int32_t line = *p32;
+
+		// File name
+		if (line == 0)
+		{
+			std::string name;
+
+			// Setup current file name
+			p32 = readString(p32 + 1, name);
+			if (name != "")
+				m_file = name;
+
+			continue;
+		}
+
+		p32++;
+
+		kcov_debug(ENGINE_MSG, "GCNO basic block in function %d, nr %d %s:%d\n",
+				m_functionId, blockNo, m_file.c_str(), line);
+		m_basicBlocks.push_back(
+				BasicBlockMapping(m_functionId, blockNo, m_file, line, n));
+
+		n++;
+	}
+}
+
+void GcnoParser::onArcs(const struct header *header, const uint8_t *data)
+{
+	const int32_t *p32 = (const int32_t *) data;
+	int32_t blockNo = p32[0];
+	const int32_t *last = &p32[header->length];
+	unsigned int arc = 0;
+
+	p32++; // Skip blockNo
+
+	// Iterate through lines
+	while (p32 < last)
+	{
+		int32_t destBlock = p32[0];
+		int32_t flags = p32[1];
+
+		// Report non-on-tree arcs
+		if (!(flags & GCOV_ARC_ON_TREE))
+			m_arcs.push_back(Arc(m_functionId, blockNo, destBlock));
+
+		kcov_debug(ENGINE_MSG, "GCNO arc in function %d, %d->%d (flags %d%s)\n",
+				m_functionId, blockNo, destBlock, flags,
+				flags & GCOV_ARC_ON_TREE ? " OT" : "");
+
+		p32 += 2;
+		arc++;
+	}
+}
+
+GcdaParser::GcdaParser(const uint8_t *data, size_t dataSize) :
+		GcovParser(data, dataSize), m_functionId(-1)
+{
+}
+
+size_t GcdaParser::countersForFunction(int32_t function)
+{
+	if (function < 0)
+		panic("Garbage in!");
+
+	if (m_functionToCounters.find(function) == m_functionToCounters.end())
+		return 0;
+
+	// Simply the size of the vector
+	return m_functionToCounters[function].size();
+}
+
+int64_t GcdaParser::getCounter(int32_t function, int32_t counter)
+{
+	if (function < 0 || counter < 0)
+		panic("Garbage in!");
+
+	if (m_functionToCounters.find(function) == m_functionToCounters.end())
+		return -1;
+
+	// List of counters
+	CounterList_t &cur = m_functionToCounters[function];
+	if ((size_t) counter >= cur.size())
+		return -1;
+
+	return cur[counter];
+}
+
+bool GcdaParser::onRecord(const struct header *header, const uint8_t *data)
+{
+	kcov_debug(ENGINE_MSG, "GCDA record: 0x%08x (%d bytes)\n", header->tag,
+			header->length * 4);
+
+	switch (header->tag)
+	{
+	case GCOV_TAG_FUNCTION:
+		onAnnounceFunction(header, data);
+		break;
+	case GCOV_TAG_COUNTER_BASE:
+		onCounterBase(header, data);
+		break;
+	default:
+		break;
+	}
+
+	return true;
+}
+
+void GcdaParser::onAnnounceFunction(const struct header *header,
+		const uint8_t *data)
+{
+	const int32_t *p32 = (const int32_t *) data;
+	int32_t ident = p32[0];
+
+	// FIXME! Handle checksums after this
+	m_functionId = ident;
+
+	kcov_debug(ENGINE_MSG, "GCDA function %d\n", ident);
+}
+
+void GcdaParser::onCounterBase(const struct header *header, const uint8_t *data)
+{
+	const int32_t *p32 = (const int32_t *) data;
+	int32_t count = header->length; // 32-bit data with 64-bit values
+
+	// Store all counters in a list
+	CounterList_t counters;
+	for (int32_t i = 0; i < count; i += 2)
+	{
+		uint64_t v64 = (uint64_t) p32[i] | ((uint64_t) p32[i + 1] << 32ULL);
+
+		counters.push_back(v64);
+
+		kcov_debug(ENGINE_MSG, "GCDA counter %d %lld\n", i,
+				(long long) counters.back());
+	}
+
+	m_functionToCounters[m_functionId] = counters;
+}
diff --git a/kcov-38/src/include/capabilities.hh b/kcov-38/src/include/capabilities.hh
new file mode 100644
index 000000000000..9a669bd4cb3e
--- /dev/null
+++ b/kcov-38/src/include/capabilities.hh
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <string>
+
+namespace kcov
+{
+	/**
+	 * Singleton class for kcov capabilities, typically for different engines.
+	 */
+	class ICapabilities
+	{
+	public:
+		virtual ~ICapabilities()
+		{
+		}
+
+		/**
+		 * Add a kcov capability.
+		 *
+		 * Will panic if an unknown capability is added.
+		 *
+		 * @param name the name of the capability
+		 */
+		virtual void addCapability(const std::string &name) = 0;
+
+		/**
+		 * Remove a kcov capability.
+		 *
+		 * Will panic if an unknown capability is removed.
+		 *
+		 * @param name the name of the capability
+		 */
+		virtual void removeCapability(const std::string &name) = 0;
+
+		/**
+		 * Return if kcov has a capability.
+		 *
+		 * Will panic if an unknown capability is added.
+		 *
+		 * @param name the name of the capability.
+		 */
+		virtual bool hasCapability(const std::string &name) = 0;
+
+
+		/**
+		 * Singleton getter.
+		 *
+		 * @return a reference to the capability singleton
+		 */
+		static ICapabilities &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/collector.hh b/kcov-38/src/include/collector.hh
new file mode 100644
index 000000000000..79e5d5f2a743
--- /dev/null
+++ b/kcov-38/src/include/collector.hh
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <string>
+
+namespace kcov
+{
+	class IFileParser;
+	class IEngine;
+	class IFilter;
+
+	/**
+	 * Run a program and collect coverage for it.
+	 */
+	class ICollector
+	{
+	public:
+		class IListener
+		{
+		public:
+			/**
+			 * Called when an address is hit.
+			 *
+			 * @param addr the address which just got executed
+			 * @param hits the number of hits for the address
+			 */
+			virtual void onAddressHit(uint64_t addr, unsigned long hits) = 0;
+		};
+
+		class IEventTickListener
+		{
+		public:
+			virtual void onTick() = 0;
+		};
+
+		virtual ~ICollector() {};
+
+		/**
+		 * Register a listener for breakpoint address hits
+		 *
+		 * @param listener the listener
+		 */
+		virtual void registerListener(IListener &listener) = 0;
+
+		/**
+		 * Register a listener for events (called on each breakpoint)
+		 */
+		virtual void registerEventTickListener(IEventTickListener &listener) = 0;
+
+		/**
+		 * Run a program and collect coverage data
+		 *
+		 * @param filename the program to run
+		 */
+		virtual int run(const std::string &filename) = 0;
+
+
+
+		static ICollector &create(IFileParser &elf, IEngine &engine, IFilter &filter);
+	};
+}
diff --git a/kcov-38/src/include/configuration.hh b/kcov-38/src/include/configuration.hh
new file mode 100644
index 000000000000..04c54c3c5cf8
--- /dev/null
+++ b/kcov-38/src/include/configuration.hh
@@ -0,0 +1,128 @@
+#pragma once
+
+#include <string>
+#include <list>
+#include <vector>
+
+namespace kcov
+{
+	/**
+	 * Class that hold kcov configuration (command line options)
+	 */
+	class IConfiguration
+	{
+	public:
+		typedef enum
+		{
+			MODE_COLLECT_ONLY       = 1,
+			MODE_REPORT_ONLY        = 2,
+			MODE_COLLECT_AND_REPORT = 3,
+			MODE_MERGE_ONLY         = 4,
+			MODE_SYSTEM_RECORD      = 5,
+			MODE_SYSTEM_REPORT      = 6,
+		} RunMode_t;
+
+		class IListener
+		{
+		public:
+			virtual ~IListener()
+			{
+			}
+
+			/**
+			 * Callback for configuration changes.
+			 *
+			 * Listeners will receive this call on each configuration change. The
+			 * call is made from a configuration thread, so watch out with races.
+			 *
+			 * @param key the name of the setting
+			 */
+			virtual void onConfigurationChanged(const std::string &key) = 0;
+		};
+		typedef std::vector<IListener *> ConfigurationListener_t;
+
+
+		virtual ~IConfiguration() {}
+
+
+		/**
+		 * Print kcov usage.
+		 */
+		virtual void printUsage() = 0;
+
+
+		/**
+		 * Return a value as a string.
+		 *
+		 * Will panic if the key is not present.
+		 *
+		 * @param key the key to lookup
+		 *
+		 * @return the string value
+		 */
+		virtual const std::string &keyAsString(const std::string &key) = 0;
+
+		/**
+		 * Return a value as an integer.
+		 *
+		 * Will panic if the key is not present.
+		 *
+		 * @param key the key to lookup
+		 *
+		 * @return the integer value
+		 */
+		virtual int keyAsInt(const std::string &key) = 0;
+
+		/**
+		 * Return a value as a string list.
+		 *
+		 * Will panic if the key is not present.
+		 *
+		 * @param key the key to lookup
+		 *
+		 * @return the values as a list, potentially empty
+		 */
+		virtual const std::vector<std::string> &keyAsList(const std::string &key) = 0;
+
+		/**
+		 * Set a key. Use these with caution.
+		 */
+		virtual void setKey(const std::string &key, const std::string &val) = 0;
+
+		virtual void setKey(const std::string &key, int val) = 0;
+
+		virtual void setKey(const std::string &key, const std::vector<std::string> &val) = 0;
+
+		/**
+		 * Return the coveree argv (i.e., without kcov and kcov options)
+		 *
+		 * @return The coveree argv
+		 */
+		virtual const char **getArgv() = 0;
+
+		/**
+		 * Return the coveree argc (i.e., without kcov and kcov options)
+		 *
+		 * @return The coveree argc
+		 */
+		virtual unsigned int getArgc() = 0;
+
+		/**
+		 * Register a configuration-changed listener
+		 *
+		 * @param listener the listener to call on changes
+		 * @param keys the keys to listen for
+		 */
+		virtual void registerListener(IListener &listener, const std::vector<std::string> &keys) = 0;
+
+
+		/**
+		 * Parse argc, argv and setup the configuration
+		 *
+		 * @return true if the configuration is OK
+		 */
+		virtual bool parse(unsigned int argc, const char *argv[]) = 0;
+
+		static IConfiguration &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/disassembler.hh b/kcov-38/src/include/disassembler.hh
new file mode 100644
index 000000000000..c28e74cf7a99
--- /dev/null
+++ b/kcov-38/src/include/disassembler.hh
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <vector>
+
+namespace kcov
+{
+	class IDisassembler
+	{
+	public:
+		virtual ~IDisassembler()
+		{
+		}
+
+		/**
+		 * Setup the verifier with an ELF file header
+		 */
+		virtual void setup(const void *header, size_t headerSize) = 0;
+
+		/**
+		 * Add an executable section
+		 *
+		 * @param sectionData the data of the section
+		 * @param sectionSize the size of the section
+		 * @param base address the virtual start address
+		 */
+		virtual void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress) = 0;
+
+		/**
+		 * Check if an address is a valid breakpoint "point".
+		 *
+		 * @return true if a breakpoint can be set on this address
+		 */
+		virtual bool verify(uint64_t address) = 0;
+
+
+		/**
+		 * Lookup the basic block for an address.
+		 *
+		 * @return a list of instructions in this basic block
+		 */
+		virtual const std::vector<uint64_t> &getBasicBlock(uint64_t address) = 0;
+
+		static IDisassembler &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/elf.hh b/kcov-38/src/include/elf.hh
new file mode 100644
index 000000000000..0fdd4fdf6dba
--- /dev/null
+++ b/kcov-38/src/include/elf.hh
@@ -0,0 +1,129 @@
+#pragma once
+
+#include <utils.hh>
+
+#include <vector>
+#include <utility>
+#include <string>
+
+// Add symbols missing from FreeBSD's elfutils.
+#ifndef ELF_NOTE_GNU
+#define ELF_NOTE_GNU "GNU"
+#endif
+#ifndef NT_GNU_BUILD_ID
+#define NT_GNU_BUILD_ID 3
+#endif
+
+namespace kcov
+{
+
+	/**
+	 * Holder class for address segments
+	 */
+	class Segment
+	{
+	public:
+		Segment(const void *data, uint64_t paddr, uint64_t vaddr, uint64_t size) :
+			m_data(NULL), m_paddr(paddr), m_vaddr(vaddr), m_size(size)
+		{
+			if (data)
+			{
+				m_data = xmalloc(size);
+				memcpy(m_data, data, size);
+			}
+		}
+
+		Segment(const Segment &other) :
+			m_data(NULL), m_paddr(other.m_paddr), m_vaddr(other.m_vaddr), m_size(other.m_size)
+		{
+			if (other.m_data)
+			{
+				m_data = xmalloc(other.m_size);
+				memcpy(m_data, other.m_data, other.m_size);
+			}
+		}
+
+		~Segment()
+		{
+			free(m_data);
+		}
+
+		/**
+		 * Check if an address is contained within this segment
+		 *
+		 * @param addr the address to check
+		 *
+		 * @return true if valid
+		 */
+		bool addressIsWithinSegment(uint64_t addr) const
+		{
+			return addr >= m_paddr && addr < m_paddr + m_size;
+		}
+
+		/**
+		 * Adjust an address with the segment.
+		 *
+		 * @param addr the address to adjust
+		 *
+		 * @return the new address
+		 */
+		uint64_t adjustAddress(uint64_t addr) const
+		{
+			if (addressIsWithinSegment(addr))
+				return addr - m_paddr + m_vaddr;
+
+			return addr;
+		}
+
+		uint64_t getBase() const
+		{
+			return m_vaddr;
+		}
+
+		const void *getData() const
+		{
+			return m_data;
+		}
+
+		size_t getSize() const
+		{
+			return m_size;
+		}
+
+	private:
+		void *m_data;
+
+		// Should really be const, but GCC 4.6 doesn't like that
+		uint64_t m_paddr;
+		uint64_t m_vaddr;
+		size_t m_size;
+	};
+
+
+	class IElf
+	{
+	public:
+		virtual ~IElf()
+		{
+		}
+
+		virtual const std::vector<std::string> &getGcovGcnoFiles() = 0;
+
+		virtual const std::vector<std::string> &getGcovGcdaFiles() = 0;
+
+		virtual const std::string &getBuildId() = 0;
+
+		/**
+		 * Return the debug link string and the CRC
+		 *
+		 * @return the debug link or NULL if there are none
+		 */
+		virtual const std::pair<std::string, uint32_t> *getDebugLink() = 0;
+
+		virtual const std::vector<Segment> &getSegments() = 0;
+
+		virtual void *getRawData(size_t &sz) = 0;
+
+		static IElf *create(const std::string &filename);
+	};
+}
diff --git a/kcov-38/src/include/engine.hh b/kcov-38/src/include/engine.hh
new file mode 100644
index 000000000000..88c973acd08e
--- /dev/null
+++ b/kcov-38/src/include/engine.hh
@@ -0,0 +1,124 @@
+#pragma once
+
+#include <manager.hh>
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <string>
+
+namespace kcov
+{
+	class IFileParser;
+
+	enum event_type
+	{
+		ev_error       = -1,
+		ev_breakpoint  =  1,
+		ev_signal      =  2,
+		ev_exit        =  3,
+		ev_exit_first_process = 4,
+		ev_signal_exit =  5,
+	};
+
+	/**
+	 * An "engine" which can run programs and collect events (e.g., breakpoints)
+	 */
+	class IEngine
+	{
+	public:
+		class Event
+		{
+		public:
+			Event(enum event_type type = ev_signal, int data = 0, uint64_t address = 0) :
+				type(type),
+				data(data),
+				addr(address)
+			{
+			}
+
+			enum event_type type;
+
+			int data; // Typically the breakpoint
+			uint64_t addr;
+		};
+
+		class IEventListener
+		{
+		public:
+			virtual void onEvent(const Event &ev) = 0;
+		};
+
+
+		virtual ~IEngine() {}
+
+		/**
+		 * Set a breakpoint
+		 *
+		 * @param addr the address to set the breakpoint on
+		 *
+		 * @return the ID of the breakpoint, or -1 on failure
+		 */
+		virtual int registerBreakpoint(unsigned long addr) = 0;
+
+		/**
+		 * Fork a new process and attach to it
+		 *
+		 * @return true if OK, false otherwise
+		 */
+		virtual bool start(IEventListener &listener, const std::string &executable) = 0;
+
+		/**
+		 * Kill child with signal
+		 *
+		 * @param sig the signal to send to the child
+		 */
+		virtual void kill(int sig) = 0;
+
+		/**
+		 * Continue execution with an event
+		 *
+		 * @return true if the process should continue, false otherwise
+		 */
+		virtual bool continueExecution() = 0;
+	};
+
+	/**
+	 * Factory class for getting one of multiple engines, which can
+	 * match different file types.
+	 */
+	class IEngineFactory
+	{
+	public:
+		class IEngineCreator
+		{
+		public:
+			IEngineCreator();
+
+			virtual IEngine *create() = 0;
+
+			/**
+			 * See if a particular file can be matched with this engine.
+			 *
+			 * Should return how well this engine fits, the higher the better
+			 *
+			 * @param filename the name of the file
+			 * @param data the first few bytes of the file
+			 * @param dataSize the size of @a data
+			 */
+			virtual unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize) = 0;
+		};
+
+		typedef IEngine *(*EngineCreator_t)(IFileParser &parser);
+
+		virtual ~IEngineFactory()
+		{
+		}
+
+		virtual void registerEngine(IEngineCreator &creator) = 0;
+
+		virtual IEngineCreator &matchEngine(const std::string &file) = 0;
+
+		static IEngineFactory &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/file-parser.hh b/kcov-38/src/include/file-parser.hh
new file mode 100644
index 000000000000..516c6556fb57
--- /dev/null
+++ b/kcov-38/src/include/file-parser.hh
@@ -0,0 +1,184 @@
+#pragma once
+
+#include <manager.hh>
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <string>
+#include <vector>
+
+#include <utils.hh>
+
+struct phdr_data_entry;
+
+namespace kcov
+{
+	class IFilter;
+
+	class IFileParser
+	{
+	public:
+		enum FileFlags
+		{
+			FLG_NONE = 0,
+			FLG_TYPE_SOLIB = 1,
+			FLG_TYPE_COVERAGE_DATA = 2, //< Typically gcov data files
+		};
+
+		enum PossibleHits
+		{
+			HITS_SINGLE,     //< Yes/no (merge-parser)
+			HITS_LIMITED,    //< E.g., multiple branches
+			HITS_UNLIMITED,  //< Accumulated (Python/bash)
+		};
+
+		/**
+		 * Holder class for files (e.g., ELF binaries)
+		 */
+		class File
+		{
+		public:
+			File(const std::string &filename, const enum FileFlags flags = FLG_NONE) :
+				m_filename(filename), m_flags(flags)
+			{
+			}
+
+			const std::string m_filename;
+			const enum FileFlags m_flags;
+		};
+
+		virtual ~IFileParser() {}
+
+		/**
+		 * Listener for lines (lines in source files)
+		 *
+		 * This is the main way the (file,lineNr) -> address map is handled.
+		 */
+		class ILineListener
+		{
+		public:
+			virtual void onLine(const std::string &file, unsigned int lineNr,
+					uint64_t addr) = 0;
+		};
+
+		/**
+		 * Listener for added files (typically an ELF binary)
+		 */
+		class IFileListener
+		{
+		public:
+			virtual void onFile(const File &file) = 0;
+		};
+
+		/**
+		 * Add a file to the parser
+		 *
+		 * @param filename the filename to add
+		 * @param phdr_data base address data for solibs
+		 *
+		 * @return true if the file could be added, false otherwise
+		 */
+		virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data = 0) = 0;
+
+		/**
+		 * Set the relocation of the main file for the position-independent executable (PIE) support
+		 *
+		 * PIEs have, like shared objects, an unknown load address which can only be
+		 * retrieved from the solib handler. Because of this the parser may defer
+		 * onFile and onLine notifications before this call.
+		 *
+		 * This method, if any, should be called after the initial parse call and
+		 * beefore the following addFile calls for solibs.
+		 *
+		 * @param relocation relocation offset
+		 *
+		 * @return true if the relocation is properly set, false otherwise
+		 */
+		virtual bool setMainFileRelocation(unsigned long relocation) = 0;
+
+		/**
+		 * Register a listener for source lines.
+		 *
+		 * Will be called when new source file/line pairs are found
+		 *
+		 * @param listener the listener
+		 */
+		virtual void registerLineListener(ILineListener &listener) = 0;
+
+		/**
+		 * Register a listener for coveree files.
+		 *
+		 * Will be called when new ELF binary (typically) is added
+		 *
+		 * @param listener the listener
+		 */
+		virtual void registerFileListener(IFileListener &listener) = 0;
+
+		/**
+		 * Parse the added files
+		 *
+		 * @return true if parsing could be done
+		 */
+		virtual bool parse() = 0;
+
+		/**
+		 * Get the checksum of the main file (not solibs)
+		 *
+		 * @return the file checksum
+		 */
+		virtual uint64_t getChecksum() = 0;
+
+		/**
+		 * Get the name of the parser
+		 *
+		 * @return the name
+		 */
+		virtual std::string getParserType() = 0;
+
+
+		/**
+		 * Return if this parser is of the multiple type (i.e., relying on
+		 * breakpoints which are cleared after hit, but can have branches),
+		 * or if every address can occur multiple times, or if only
+		 * covered/non-covered is possible.
+		 *
+		 * @return the possible hits of this parser
+		 */
+		virtual enum PossibleHits maxPossibleHits() = 0;
+
+		/**
+		 * See if a particular file can be matched with this parser.
+		 *
+		 * Should return how well this parser fits, the higher the better
+		 *
+		 * @param filename the name of the file
+		 * @param data the first few bytes of the file
+		 * @param dataSize the size of @a data
+		 */
+		virtual unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize) = 0;
+
+		// Setup once the parser has been chosen
+		virtual void setupParser(IFilter *filter) = 0;
+	};
+
+
+	/**
+	 * Manager class for getting one of multiple parsers, which can
+	 * match different file types.
+	 */
+	class IParserManager
+	{
+	public:
+		virtual ~IParserManager()
+		{
+		}
+
+		virtual void registerParser(IFileParser &parser) = 0;
+
+		virtual IFileParser *matchParser(const std::string &file) = 0;
+
+		static IParserManager &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/filter.hh b/kcov-38/src/include/filter.hh
new file mode 100644
index 000000000000..9f23583d02e2
--- /dev/null
+++ b/kcov-38/src/include/filter.hh
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <string>
+
+namespace kcov
+{
+	/**
+	 * Class for filtering output data.
+	 *
+	 * Used for the --include-path and --include-pattern command line options.
+	 */
+	class IFilter
+	{
+	public:
+		class Handler
+		{
+		public:
+			virtual bool includeFile(const std::string &file) = 0;
+		};
+
+		/**
+		 * Run filters on @a path.
+		 *
+		 * @param path the path to check
+		 *
+		 * @return true if this path should be included in the output, false otherwise.
+		 */
+		virtual bool runFilters(const std::string &path) = 0;
+
+		/**
+		 * Run filters on file/line pair.
+		 *
+		 * @param path the path to check
+		 *
+		 * @return true if this path should be included in the output, false otherwise.
+		 */
+		virtual bool runLineFilters(const std::string &filePath,
+				unsigned int lineNr,
+				const std::string &line) = 0;
+
+		/**
+		 * Convert source path to a real path and (if configured) run replacement
+		 * on parts of the path (if the source has moved).
+		 *
+		 * @param path the path to mangle
+		 *
+		 * @return the mangled path
+		 */
+		virtual std::string mangleSourcePath(const std::string &path) = 0;
+
+		static IFilter &create();
+
+		static IFilter &createBasic();
+
+
+		virtual ~IFilter() {}
+	};
+}
diff --git a/kcov-38/src/include/gcov.hh b/kcov-38/src/include/gcov.hh
new file mode 100644
index 000000000000..f7ac9d3851f7
--- /dev/null
+++ b/kcov-38/src/include/gcov.hh
@@ -0,0 +1,182 @@
+#include <stdint.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <functional>
+
+struct header;
+
+namespace kcov
+{
+	/**
+	 * Combine basic block/file info into an "address"
+	 *
+	 * @param filename the source filename
+	 * @param function the function to map for
+	 * @param basicBlock the basic block number
+	 * @param lineIndex the index number in the basic block map
+	 */
+	static inline uint64_t gcovGetAddress(const std::string &filename, int32_t function,
+			int32_t basicBlock, int32_t lineIndex)
+	{
+		uint32_t fn16 = ((uint32_t)function) & 0xffff;
+		uint32_t bb16 = ((uint32_t)basicBlock) & 0xffff;
+		uint64_t fnAndBb = (fn16 << 16) | bb16;
+		uint64_t fileNameHash = (((uint64_t)std::hash<std::string>()(filename)) & 0xffffff00ULL);
+		uint64_t lineIndexMask = lineIndex & 0xffULL;
+
+		return (fileNameHash << 32ULL) | (lineIndexMask << 32ULL) | fnAndBb;
+	}
+
+	class GcovParser
+	{
+	public:
+		/**
+		 * Parse the gcov file.
+		 *
+		 * @return true if the file was OK, false otherwise
+		 */
+		bool parse();
+
+	protected:
+		GcovParser(const uint8_t *data, size_t dataSize);
+
+		virtual ~GcovParser();
+
+		virtual bool onRecord(const struct header *header, const uint8_t *data) = 0;
+
+		bool verify();
+
+		const uint8_t *readString(const uint8_t *p, std::string &out);
+
+		// Convenience when using 32-bit pointers
+		const int32_t *readString(const int32_t *p, std::string &out);
+
+
+		const uint8_t *padPointer(const uint8_t *p);
+
+	private:
+		const uint8_t *m_data;
+		size_t m_dataSize;
+	};
+
+	// Specialized parser for gcno files
+	class GcnoParser : public GcovParser
+	{
+	public:
+		// Holder-class for fn/bb -> file/line
+		class BasicBlockMapping
+		{
+		public:
+			int32_t m_function;
+			int32_t m_basicBlock;
+			std::string m_file;
+			int32_t m_line;
+			int32_t m_index;
+
+			BasicBlockMapping(const BasicBlockMapping &other);
+
+			BasicBlockMapping(int32_t function, int32_t basicBlock,
+					const std::string &file, int32_t line, int32_t index);
+		};
+
+		// Holder-class for arcs between blocks
+		class Arc
+		{
+		public:
+			int32_t m_function;
+			int32_t m_srcBlock;
+			int32_t m_dstBlock;
+
+			Arc(const Arc &other);
+
+			Arc(int32_t function, int32_t srcBlock, int32_t dstBlock);
+		};
+
+		typedef std::vector<BasicBlockMapping> BasicBlockList_t;
+		typedef std::vector<int32_t> FunctionList_t;
+		typedef std::vector<Arc> ArcList_t;
+
+
+
+		GcnoParser(const uint8_t *data, size_t dataSize);
+
+		/* Return a reference to the basic blocks to file/line in the file.
+		 * Empty if parse() hasn't been called.
+		 *
+		 * @return the basic blocks
+		 */
+		const BasicBlockList_t &getBasicBlocks();
+
+		/**
+		 * Return a reference to the arcs in the file. Empty if parse() hasn't
+		 * been called.
+		 *
+		 * @return the arcs
+		 */
+		const ArcList_t &getArcs();
+
+		/**
+		 * Return a reference to the function IDs in the file. Empty if parse()
+		 * hasn't been called.
+		 *
+		 * @return the functions
+		 */
+		const FunctionList_t &getFunctions();
+
+	protected:
+		bool onRecord(const struct header *header, const uint8_t *data);
+
+	private:
+		// Handler for record types
+		void onAnnounceFunction(const struct header *header, const uint8_t *data);
+		void onBlocks(const struct header *header, const uint8_t *data);
+		void onLines(const struct header *header, const uint8_t *data);
+		void onArcs(const struct header *header, const uint8_t *data);
+
+		std::string m_file;
+		std::string m_function;
+		int32_t m_functionId;
+		FunctionList_t m_functions;
+		BasicBlockList_t m_basicBlocks;
+		ArcList_t m_arcs;
+	};
+
+	class GcdaParser : public GcovParser
+	{
+	public:
+		GcdaParser(const uint8_t *data, size_t dataSize);
+
+		/**
+		 * Return the number of counters for a particular function.
+		 *
+		 * @param function the function
+		 *
+		 * @return the number of counters, or 0 for invalid functions
+		 */
+		size_t countersForFunction(int32_t function);
+
+		/**
+		 * Return the counter value for a function.
+		 *
+		 * @param function the function
+		 * @param counter the counter number
+		 *
+		 * @return the counter value, or -1 for invalid function/counters
+		 */
+		int64_t getCounter(int32_t function, int32_t counter);
+
+	protected:
+		bool onRecord(const struct header *header, const uint8_t *data);
+
+		void onAnnounceFunction(const struct header *header, const uint8_t *data);
+
+		void onCounterBase(const struct header *header, const uint8_t *data);
+
+		typedef std::vector<int64_t> CounterList_t;
+		typedef std::unordered_map<int32_t, CounterList_t> FunctionToCountersMap_t;
+
+		int32_t m_functionId;
+		FunctionToCountersMap_t m_functionToCounters;
+	};
+}
diff --git a/kcov-38/src/include/generated-data-base.hh b/kcov-38/src/include/generated-data-base.hh
new file mode 100644
index 000000000000..69998d26fc3c
--- /dev/null
+++ b/kcov-38/src/include/generated-data-base.hh
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace kcov
+{
+	class GeneratedData
+	{
+	public:
+		GeneratedData(const uint8_t *p, size_t size) :
+			m_data(p), m_size(size)
+		{
+		}
+
+		const uint8_t *data() const
+		{
+			return m_data;
+		}
+
+		const size_t size() const
+		{
+			return m_size;
+		}
+
+	private:
+		const uint8_t *m_data;
+		size_t m_size;
+	};
+}
diff --git a/kcov-38/src/include/lineid.hh b/kcov-38/src/include/lineid.hh
new file mode 100644
index 000000000000..416262ab9009
--- /dev/null
+++ b/kcov-38/src/include/lineid.hh
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdint.h>
+
+#include <functional>
+#include <string>
+
+namespace kcov
+{
+	static uint64_t getLineId(const std::string &fileName, unsigned int nr)
+	{
+		return (std::hash<std::string>()(fileName) & 0xffffffff) | ((uint64_t)nr << 32ULL);
+	}
+}
diff --git a/kcov-38/src/include/manager.hh b/kcov-38/src/include/manager.hh
new file mode 100644
index 000000000000..d28fe8ec0acc
--- /dev/null
+++ b/kcov-38/src/include/manager.hh
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace kcov
+{
+	enum match_type
+	{
+		match_none = 0,
+		match_perfect = 0xffffffff,
+	};
+}
diff --git a/kcov-38/src/include/output-handler.hh b/kcov-38/src/include/output-handler.hh
new file mode 100644
index 000000000000..634ffaf00f2d
--- /dev/null
+++ b/kcov-38/src/include/output-handler.hh
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <string>
+
+namespace kcov
+{
+	class IWriter;
+	class IReporter;
+	class IFileParser;
+	class ICollector;
+
+	class IOutputHandler
+	{
+	public:
+		virtual ~IOutputHandler() {}
+
+		virtual void registerWriter(IWriter &writer) = 0;
+
+		virtual void start() = 0;
+
+		virtual void stop() = 0;
+
+		virtual void produce() = 0;
+
+
+		virtual const std::string &getBaseDirectory() = 0;
+
+		virtual const std::string &getOutDirectory() = 0;
+
+		static IOutputHandler &create(IReporter &reporter, ICollector *collector);
+
+		static IOutputHandler &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/phdr_data.h b/kcov-38/src/include/phdr_data.h
new file mode 100644
index 000000000000..a023c14ebef4
--- /dev/null
+++ b/kcov-38/src/include/phdr_data.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct phdr_data_segment
+{
+	unsigned long paddr;
+	unsigned long vaddr;
+	unsigned long size;
+};
+
+struct phdr_data_entry
+{
+	char name[1024];
+	uint32_t n_segments;
+
+	// "Reasonable" max
+	struct phdr_data_segment segments[64];
+};
+
+struct phdr_data
+{
+	uint32_t magic;
+	uint32_t version;
+	unsigned long relocation; // for PIE
+	uint32_t n_entries;
+
+	struct phdr_data_entry entries[];
+};
+
+struct dl_phdr_info;
+
+struct phdr_data *phdr_data_new(size_t size);
+
+void phdr_data_add(struct phdr_data *p, struct dl_phdr_info *info);
+
+void *phdr_data_marshal(struct phdr_data *p, size_t *out_sz);
+
+void phdr_data_free(struct phdr_data *p);
+
+struct phdr_data *phdr_data_unmarshal(void *p);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/kcov-38/src/include/reporter.hh b/kcov-38/src/include/reporter.hh
new file mode 100644
index 000000000000..bc058e69c39b
--- /dev/null
+++ b/kcov-38/src/include/reporter.hh
@@ -0,0 +1,130 @@
+#pragma once
+
+#include <string>
+
+#include <stddef.h>
+
+namespace kcov
+{
+	class IFileParser;
+	class ICollector;
+	class IFilter;
+
+	/**
+	 * Interface class that reports addresses pairs being executed.
+	 *
+	 * Can also be queried for code lines etc.
+	 */
+	class IReporter
+	{
+	public:
+		class LineExecutionCount
+		{
+		public:
+			LineExecutionCount(unsigned int hits, unsigned int possibleHits, uint64_t order) :
+				m_hits(hits), m_possibleHits(possibleHits), m_order(order)
+			{
+			}
+
+			unsigned int m_hits;
+			unsigned int m_possibleHits;
+			uint64_t m_order;
+		};
+
+		class ExecutionSummary
+		{
+		public:
+			ExecutionSummary() : m_lines(0), m_executedLines(0), m_includeInTotals(true)
+			{
+			}
+
+			ExecutionSummary(unsigned int lines, unsigned int executedLines) :
+				m_lines(lines), m_executedLines(executedLines), m_includeInTotals(true)
+			{
+			}
+
+			unsigned int m_lines;
+			unsigned int m_executedLines;
+			unsigned int m_includeInTotals;
+		};
+
+		/**
+		 * Listener to executed addresses.
+		 */
+		class IListener
+		{
+		public:
+			/**
+			 * An address has been executed by the covered program. Can also
+			 * report data from previous runs.
+			 *
+			 * @param addr the executed address
+			 * @param hits the number of hits of the address (typically 1)
+			 */
+			virtual void onAddress(uint64_t addr, unsigned long hits) = 0;
+
+			/**
+			 * Re-report on-lines from the file-parser.
+			 *
+			 * The address can be changed by the reporter, so this will match
+			 * onAddress above.
+			 *
+			 * @param file the source file
+			 * @param lineNr the line number in @a file
+			 * @param addr the (hashed) address for this file/line combination
+			 */
+			virtual void onLineReporter(const std::string &file, unsigned int lineNr, uint64_t addr) {}
+		};
+
+		virtual ~IReporter() {}
+
+
+		/**
+		 * Register a listener for reported addresses.
+		 *
+		 * @param listener the listener
+		 */
+		virtual void registerListener(IListener &listener) = 0;
+
+		/**
+		 * Return if a file path should be included in the output.
+		 *
+		 * @param file the file path to check
+		 *
+		 * @return true if the file should be included in the output
+		 */
+		virtual bool fileIsIncluded(const std::string &file) = 0;
+
+		/**
+		 * Returns if a file/line pair contains executable code.
+		 *
+		 * @param file the filename
+		 * @param lineNr the line number in the file
+		 *
+		 * @return true if this is executable code, false otherwise
+		 */
+		virtual bool lineIsCode(const std::string &file, unsigned int lineNr) = 0;
+
+		/**
+		 * Get the execution count for a file:line pair
+		 *
+		 * @param file the filename to check
+		 * @param lineNr the line to check
+		 *
+		 * @return the execution count
+		 */
+		virtual LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr) = 0;
+
+		/**
+		 * Get a summary of what has been executed so far
+		 *
+		 * @return the summary
+		 */
+		virtual ExecutionSummary getExecutionSummary() = 0;
+
+		virtual void writeCoverageDatabase() = 0;
+
+		static IReporter &create(IFileParser &elf, ICollector &collector, IFilter &filter);
+		static IReporter &createDummyReporter();
+	};
+}
diff --git a/kcov-38/src/include/solib-handler.hh b/kcov-38/src/include/solib-handler.hh
new file mode 100644
index 000000000000..75606d9c2834
--- /dev/null
+++ b/kcov-38/src/include/solib-handler.hh
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <engine.hh>
+#include <collector.hh>
+
+namespace kcov
+{
+	class ISolibHandler
+	{
+	public:
+		virtual ~ISolibHandler()
+		{
+		}
+
+		virtual void startup() = 0;
+	};
+
+	ISolibHandler &createSolibHandler(IFileParser &parser, ICollector &collector);
+
+	// Wait for the solib thread to finish parsing the solib data
+	void blockUntilSolibDataRead();
+}
diff --git a/kcov-38/src/include/source-file-cache.hh b/kcov-38/src/include/source-file-cache.hh
new file mode 100644
index 000000000000..c0cb00ee213f
--- /dev/null
+++ b/kcov-38/src/include/source-file-cache.hh
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <vector>
+#include <string>
+
+namespace kcov
+{
+	/**
+	 * Cache class for source code
+	 */
+	class ISourceFileCache
+	{
+	public:
+		virtual ~ISourceFileCache()
+		{
+		}
+
+		/**
+		 * Get the source lines of a file
+		 *
+		 * @param filePath the file to lookup
+		 *
+		 * @return A reference to the source lines (possibly empty)
+		 */
+		virtual const std::vector<std::string> &getLines(const std::string &filePath) = 0;
+
+		/**
+		 * Get the checksum for a file
+		 *
+		 * @return the CRC32 of the file
+		 */
+		virtual uint32_t getCrc(const std::string &filePath) = 0;
+
+		virtual bool fileExists(const std::string &filePath) = 0;
+
+		static ISourceFileCache &getInstance();
+	};
+}
diff --git a/kcov-38/src/include/swap-endian.hh b/kcov-38/src/include/swap-endian.hh
new file mode 100644
index 000000000000..d79d4979f4bb
--- /dev/null
+++ b/kcov-38/src/include/swap-endian.hh
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <stdlib.h>
+#include <stdint.h>
+
+// From http://stackoverflow.com/questions/105252/how-do-i-convert-between-big-endian-and-little-endian-values-in-c
+template <typename T>
+T swap_endian(T u)
+{
+	union
+	{
+		T u;
+		unsigned char u8[sizeof(T)];
+	} source, dest;
+
+	source.u = u;
+
+	for (size_t k = 0; k < sizeof(T); k++)
+		dest.u8[k] = source.u8[sizeof(T) - k - 1];
+
+	return dest.u;
+}
+
+
+static inline bool cpu_is_little_endian()
+{
+	static const uint16_t data = 0x1122;
+	const uint8_t *p = (uint8_t *)&data;
+
+	return p[0] == 0x22;
+}
+
+template <typename T>
+T to_be(T u)
+{
+	if (cpu_is_little_endian())
+		return swap_endian<T>(u);
+	else
+		return u;
+}
+
+template <typename T>
+T to_le(T u)
+{
+	if (cpu_is_little_endian())
+		return u;
+	else
+		return swap_endian<T>(u);
+}
+
+template <typename T>
+T be_to_host(T u)
+{
+	if (cpu_is_little_endian())
+		return swap_endian<T>(u);
+	else
+		return u;
+}
+
+template <typename T>
+T le_to_host(T u)
+{
+	if (cpu_is_little_endian())
+		return u;
+	else
+		return swap_endian<T>(u);
+}
diff --git a/kcov-38/src/include/system-mode/file-data.hh b/kcov-38/src/include/system-mode/file-data.hh
new file mode 100644
index 000000000000..eb93efd45a03
--- /dev/null
+++ b/kcov-38/src/include/system-mode/file-data.hh
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <string>
+#include <vector>
+
+/* Data is always 8-byte aligned, and the trailer as well */
+struct trailer
+{
+	uint32_t magic;
+	uint32_t version;
+	uint32_t compressed_size;
+	uint32_t uncompressed_size;
+	uint32_t id;
+
+	uint32_t filename_size; // NULL-terminated, 8-byte aligned string
+	uint32_t options_size;  // Ditto, after filename
+
+	uint16_t n_entries;
+};
+
+const static uint32_t TRAILER_MAGIC = 0x19992000;
+const static uint32_t TRAILER_VERSION = 1;
+
+namespace kcov
+{
+	class SystemModeFile
+	{
+	public:
+		~SystemModeFile();
+
+		void addEntry(uint32_t index, uint64_t value);
+
+		/**
+		 * Get processed data, allocated with malloc.
+		 */
+		const void *getProcessedData(size_t &outSize) const;
+
+		const std::string &getOptions() const;
+
+		uint32_t getId() const;
+
+		const std::string &getFilename() const;
+
+		const std::vector<uint64_t> &getEntries() const;
+
+		static SystemModeFile *fromRawFile(uint32_t id, const std::string &filename, const std::string &options,
+				const void *fileData, size_t fileSize);
+		static SystemModeFile *fromProcessedFile(const void *fileData, size_t fileSize);
+
+	private:
+		SystemModeFile();
+
+		bool parse(const void *fileData, size_t fileSize, bool isRaw);
+
+		std::string m_filename;
+		std::string m_options;
+		uint32_t m_id;
+		void *m_data;
+		size_t m_fileSize;
+
+		std::vector<uint64_t> m_entries;
+	};
+};
diff --git a/kcov-38/src/include/system-mode/registration.hh b/kcov-38/src/include/system-mode/registration.hh
new file mode 100644
index 000000000000..216aa860c37e
--- /dev/null
+++ b/kcov-38/src/include/system-mode/registration.hh
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <stdint.h>
+
+#include <string>
+
+struct new_process_entry
+{
+	uint32_t magic;
+	uint32_t version;
+
+	uint16_t entry_size;
+	uint16_t pid;
+
+	char filename[];
+};
+
+const static uint32_t NEW_PROCES_MAGIC = 0x76817812;
+const static uint32_t NEW_PROCES_VERSION = 1;
+
+bool parseProcessEntry(struct new_process_entry *p, uint16_t &outPid, std::string &outFilename);
+
+struct new_process_entry *createProcessEntry(uint16_t pid, const std::string &filename);
diff --git a/kcov-38/src/include/utils.hh b/kcov-38/src/include/utils.hh
new file mode 100644
index 000000000000..81280708e557
--- /dev/null
+++ b/kcov-38/src/include/utils.hh
@@ -0,0 +1,212 @@
+#pragma once
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <semaphore.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <zlib.h>
+
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <list>
+
+#define error(x...) do \
+{ \
+	fprintf(stderr, "kcov: error: "); \
+	fprintf(stderr, x); \
+	fprintf(stderr, "\n"); \
+} while(0)
+
+#define warning(x...) do \
+{ \
+	fprintf(stderr, "kcov: warning: "); \
+	fprintf(stderr, x); \
+	fprintf(stderr, "\n"); \
+} while(0)
+
+#define panic(x...) do \
+{ \
+	error(x); \
+	exit(1); \
+} while(0)
+
+enum debug_mask
+{
+	INFO_MSG   =   1,
+	ENGINE_MSG =   2,
+	ELF_MSG    =   4,
+	BP_MSG     =   8,
+	STATUS_MSG =  16,
+};
+extern int g_kcov_debug_mask;
+
+static inline void kcov_debug(enum debug_mask dbg, const char *fmt, ...) __attribute__((format(printf,2,3)));
+
+static inline void kcov_debug(enum debug_mask dbg, const char *fmt, ...)
+{
+	va_list ap;
+
+	if ((g_kcov_debug_mask & dbg) == 0)
+		return;
+
+	va_start(ap, fmt);
+	vfprintf(stdout, fmt, ap);
+	va_end(ap);
+}
+
+#define panic_if(cond, x...) \
+		do { if ((cond)) panic(x); } while(0)
+
+static inline char *xstrdup(const char *s)
+{
+	char *out = strdup(s);
+
+	panic_if(!out, "strdup failed");
+
+	return out;
+}
+
+static inline void *xmalloc(size_t sz)
+{
+  void *out = malloc(sz);
+
+  panic_if(!out, "malloc failed");
+  memset(out, 0, sz);
+
+  return out;
+}
+
+static inline void *xrealloc(void *p, size_t sz)
+{
+  void *out = realloc(p, sz);
+
+  panic_if(!out, "realloc failed");
+
+  return out;
+}
+
+extern int write_file(const void *data, size_t len, const char *fmt, ...) __attribute__((format(printf,3,4)));
+
+extern void *read_file(size_t *out_size, const char *fmt, ...) __attribute__((format(printf,2,3)));
+
+extern void *peek_file(size_t *out_size, const char *fmt, ...) __attribute__((format(printf,2,3)));
+
+extern std::string dir_concat(const std::string &dir, const std::string &filename);
+
+#define xwrite_file(data, len, dir...) do { \
+	int r = write_file(data, len, dir); \
+	panic_if (r != 0, "write_file failed with %d\n", r); \
+} while(0)
+
+#define xsnprintf(buf, size, fmt, x...) do { \
+    int r = snprintf(buf, size, fmt, x); \
+    panic_if(r < 0 || r >= (int)(size), "snprintf failed for %s with %d\n", fmt, r); \
+} while(0)
+
+
+extern bool file_exists(const std::string &path);
+
+extern bool executable_exists_in_path(const std::string &path);
+
+extern uint64_t get_file_timestamp(const std::string &path);
+
+extern int concat_files(const char *dst, const char *file_a, const char *file_b);
+
+extern const char *get_home();
+
+/**
+ * Return true if a FILE * is readable without blocking.
+ *
+ * @param fp the file to read
+ * @param ms the number of milliseconds to wait
+ *
+ * @return true if the file can be read without blocking, false otherwise
+ */
+bool file_readable(FILE *fp, unsigned int ms);
+
+unsigned long get_aligned(unsigned long addr);
+
+unsigned long get_aligned_4b(unsigned long addr);
+
+
+std::string fmt(const char *fmt, ...) __attribute__((format(printf,1,2)));
+
+void mdelay(unsigned int ms);
+
+uint64_t get_ms_timestamp(void);
+
+bool machine_is_64bit(void);
+
+std::vector<std::string> split_string(const std::string &s, const char *delims);
+
+std::string trim_string(const std::string &strIn, const std::string &trimEndChars = " \t\n\r");
+
+const std::string &get_real_path(const std::string &path);
+
+// Split into path / filename
+std::pair<std::string, std::string> split_path(const std::string &pathStr);
+
+bool string_is_integer(const std::string &str, unsigned base = 0);
+
+int64_t string_to_integer(const std::string &str, unsigned base = 0);
+
+std::string escape_html(const std::string &str);
+
+std::string escape_json(const std::string &str);
+
+void msleep(uint64_t ms);
+
+class Semaphore
+{
+private:
+	sem_t *m_sem;
+    std::string m_name;
+    
+public:
+	Semaphore(int initial = 1)
+	{
+		m_name = fmt("/kcov-sem.%p", this);
+
+		m_sem = sem_open(m_name.c_str(), O_CREAT, 0644, initial);
+        if (!m_sem)
+            panic("Can't create semaphore");
+	}
+
+	~Semaphore()
+	{
+		sem_close(m_sem);
+        sem_unlink(m_name.c_str());
+	}
+
+	void notify()
+	{
+		sem_post(m_sem);
+	}
+
+	void wait()
+	{
+		sem_wait(m_sem);
+	}
+};
+
+// Unit test stuff
+void mock_read_file(void *(*callback)(size_t *out_size, const char *path));
+
+void mock_write_file(int (*callback)(const void *data, size_t size, const char *path));
+
+void mock_file_exists(bool (*callback)(const std::string &path));
+
+void mock_get_file_timestamp(uint64_t (*callback)(const std::string &path));
+
+
+static inline uint32_t hash_block(const void *buf, size_t len)
+{
+	return crc32(0, (const Bytef *)buf, len);
+}
diff --git a/kcov-38/src/include/writer.hh b/kcov-38/src/include/writer.hh
new file mode 100644
index 000000000000..a85ede0de721
--- /dev/null
+++ b/kcov-38/src/include/writer.hh
@@ -0,0 +1,33 @@
+#pragma once
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+
+	/**
+	 * Class that writes output (HTML, Cobertura, ...)
+	 */
+	class IWriter
+	{
+	public:
+		virtual ~IWriter() {}
+
+		/**
+		 * Called once on startup to setup the writer.
+		 */
+		virtual void onStartup() = 0;
+
+		/**
+		 * Called once on termination to shutdown the writer.
+		 */
+		virtual void onStop() = 0;
+
+		/**
+		 * Write current data.
+		 *
+		 * Called in regular intervals during execution.
+		 */
+		virtual void write() = 0;
+	};
+}
diff --git a/kcov-38/src/kernel/Makefile b/kcov-38/src/kernel/Makefile
new file mode 100644
index 000000000000..ee6d69435331
--- /dev/null
+++ b/kcov-38/src/kernel/Makefile
@@ -0,0 +1,12 @@
+KDIR := /lib/modules/$(shell uname -r)/build
+PWD := $(shell pwd)
+
+CFLAGS_kprobe-coverage.o += -g3
+
+obj-m += kprobe-coverage.o
+
+default:
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+
+clean:
+	rm -f *.o *.ko *.order *.symvers *.mod.c
diff --git a/kcov-38/src/kernel/kprobe-coverage.c b/kcov-38/src/kernel/kprobe-coverage.c
new file mode 100644
index 000000000000..9ed1edeaf7e4
--- /dev/null
+++ b/kcov-38/src/kernel/kprobe-coverage.c
@@ -0,0 +1,589 @@
+/*
+ * lib/kprobe-coverage.c
+ *
+ * Copyright (C) 2014 Simon Kagstrom
+ *
+ * Author: Simon Kagstrom <simon.kagstrom@gmail.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+#include <linux/module.h>
+#include <linux/kprobes.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/debugfs.h>
+#include <linux/workqueue.h>
+#include <linux/wait.h>
+#include <linux/fs.h>
+#include <linux/vmalloc.h>
+#include <linux/slab.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
+
+struct kprobe_coverage
+{
+	struct dentry *debugfs_root;
+
+	struct workqueue_struct *workqueue;
+	wait_queue_head_t wait_queue;
+
+	/* Each coverage entry is on exactly one of these lists */
+	struct list_head deferred_list; /* Probes for not-yet-loaded-modules */
+
+	struct list_head pending_list;  /* Probes which has not yet triggered */
+	struct list_head hit_list;      /* Triggered probes awaiting readout */
+
+	const char *module_names[32];
+	unsigned int name_count;
+
+	struct mutex lock;
+};
+
+struct kprobe_coverage_entry
+{
+	struct kprobe kp;
+	int name_index; /* an index into the name table above (0 is always the kernel */
+	unsigned long base_addr;
+
+	struct list_head lh;
+	struct work_struct work;
+};
+
+static struct kprobe_coverage *global_kpc;
+
+/* Return index into module name vector. Should be called with
+ * mutex held. */
+static int module_name_to_index(struct kprobe_coverage *kpc,
+		const char *module_name)
+{
+	int i;
+
+	BUG_ON(!mutex_is_locked(&kpc->lock));
+
+	/* The first is always the kernel (NULL) */
+	if (module_name == NULL)
+		return 0;
+
+	for (i = 1; i < kpc->name_count; i++) {
+		if (strcmp(kpc->module_names[i], module_name) == 0)
+			return i;
+	}
+
+	return -1;
+}
+
+static int kpc_allocate_module_name_index(struct kprobe_coverage *kpc,
+		const char *module_name)
+{
+	int index;
+
+	mutex_lock(&kpc->lock);
+	index = module_name_to_index(kpc, module_name);
+
+	/* Not found? If so allocate new entry unless vector is full */
+	if (index < 0 && kpc->name_count < ARRAY_SIZE(kpc->module_names)) {
+		index = kpc->name_count;
+
+		kpc->module_names[index] = kstrdup(module_name, GFP_KERNEL);
+		kpc->name_count++;
+	}
+	mutex_unlock(&kpc->lock);
+
+	return index;
+
+}
+
+static int kpc_pre_handler(struct kprobe *kp, struct pt_regs *regs)
+{
+	struct kprobe_coverage_entry *entry = (struct kprobe_coverage_entry *)
+					container_of(kp, struct kprobe_coverage_entry, kp);
+
+	/* Schedule it for removal */
+	queue_work(global_kpc->workqueue, &entry->work);
+
+	return 0;
+}
+
+static void kpc_probe_work(struct work_struct *work)
+{
+	struct kprobe_coverage_entry *entry = (struct kprobe_coverage_entry *)
+					container_of(work, struct kprobe_coverage_entry, work);
+	struct kprobe_coverage *kpc = global_kpc;
+
+	unregister_kprobe(&entry->kp);
+
+	/* Move from pending list to the hit list */
+	mutex_lock(&kpc->lock);
+
+	list_del(&entry->lh);
+	list_add_tail(&entry->lh, &kpc->hit_list);
+
+	/* Wake up the listener */
+	wake_up(&kpc->wait_queue);
+
+	mutex_unlock(&kpc->lock);
+}
+
+
+static void free_entry(struct kprobe_coverage_entry *entry)
+{
+	kfree(entry);
+}
+
+static struct kprobe_coverage_entry *new_entry(struct kprobe_coverage *kpc,
+		const char *module_name, struct module *mod, unsigned long where)
+{
+	struct kprobe_coverage_entry *out;
+	unsigned long base_addr = 0;
+
+	out = kzalloc(sizeof(*out), GFP_KERNEL);
+	if (!out)
+		return NULL;
+
+	/* Setup the base address if we know it, otherwise keep at 0 */
+	if (mod)
+		base_addr = (unsigned long)mod->module_core;
+
+	out->name_index = kpc_allocate_module_name_index(kpc, module_name);
+	out->base_addr = base_addr;
+	out->kp.addr = (void *)(base_addr + where);
+	out->kp.pre_handler = kpc_pre_handler;
+	INIT_WORK(&out->work, kpc_probe_work);
+
+	return out;
+}
+
+/* Called with the lock held */
+static int enable_probe(struct kprobe_coverage *kpc,
+		struct kprobe_coverage_entry *entry)
+{
+	int err;
+
+	BUG_ON(!mutex_is_locked(&kpc->lock));
+
+	/* Done before enable_kprobe so that it's really on the list if
+	 * triggered */
+	list_add(&entry->lh, &kpc->pending_list);
+
+	if ( (err = register_kprobe(&entry->kp)) < 0) {
+		list_del(&entry->lh);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+/* Called with the lock held */
+static void defer_probe(struct kprobe_coverage *kpc,
+		struct kprobe_coverage_entry *entry)
+{
+	list_add(&entry->lh, &kpc->deferred_list);
+}
+
+static void kpc_add_probe(struct kprobe_coverage *kpc, const char *module_name,
+		unsigned long where)
+{
+	struct module *module = NULL;
+	struct kprobe_coverage_entry *entry;
+	int rv = 0;
+
+	/* Lookup the module which should be instrumented */
+	if (module_name) {
+		preempt_disable();
+		module = find_module(module_name);
+		preempt_enable();
+	}
+
+	entry = new_entry(kpc, module_name, module, where);
+
+	/* Three cases:
+	 *
+	 * 1. pending module - module_name is !NULL, module is NULL: Defer
+	 *    instrumentation
+	 *
+	 * 2. vmlinux - module_name and module is NULL: Instrument directly
+	 *
+	 * 3. loaded module - module_name and module is !NULL: Instrument directly
+	 */
+	mutex_lock(&kpc->lock);
+	if (module_name && !module)
+		defer_probe(kpc, entry);
+	else
+		rv = enable_probe(kpc, entry);
+	mutex_unlock(&kpc->lock);
+
+	/* Probe enabling might fail, just free the entry */
+	if (rv < 0)
+		free_entry(entry);
+}
+
+/* Called with lock held */
+static void clear_list(struct kprobe_coverage *kpc,
+		struct list_head *list, int do_unregister)
+{
+	struct list_head *iter;
+	struct list_head *tmp;
+
+	BUG_ON(!mutex_is_locked(&kpc->lock));
+
+	list_for_each_safe(iter, tmp, list) {
+		struct kprobe_coverage_entry *entry;
+
+		entry = (struct kprobe_coverage_entry *)container_of(iter,
+				struct kprobe_coverage_entry, lh);
+		if (do_unregister)
+			unregister_kprobe(&entry->kp);
+		list_del(&entry->lh);
+		free_entry(entry);
+	}
+}
+
+static void kpc_clear(struct kprobe_coverage *kpc)
+{
+	int i;
+
+	/* Free everything on the lists */
+	mutex_lock(&kpc->lock);
+
+	clear_list(kpc, &kpc->deferred_list, 0);
+	clear_list(kpc, &kpc->hit_list, 1);
+	clear_list(kpc, &kpc->pending_list, 1);
+
+	INIT_LIST_HEAD(&kpc->deferred_list);
+	INIT_LIST_HEAD(&kpc->pending_list);
+	INIT_LIST_HEAD(&kpc->hit_list);
+
+	for (i = 0; i < kpc->name_count; i++) {
+		kfree(kpc->module_names[i]);
+
+		kpc->module_names[i] = NULL;
+	}
+	/* Kernel is still at 0 */
+	kpc->name_count = 1;
+
+	mutex_unlock(&kpc->lock);
+}
+
+static void *kpc_unlink_next(struct kprobe_coverage *kpc)
+{
+	struct kprobe_coverage_entry *entry = NULL;
+
+	/* Remove the next entry, if any */
+	mutex_lock(&kpc->lock);
+	if (!list_empty(&kpc->hit_list)) {
+		entry = list_first_entry(&kpc->hit_list, struct kprobe_coverage_entry, lh);
+		list_del(&entry->lh);
+	}
+	mutex_unlock(&kpc->lock);
+
+	return entry;
+}
+
+static void *kpc_seq_start(struct seq_file *s, loff_t *pos)
+{
+	struct kprobe_coverage *kpc = s->private;
+	int rv;
+
+	 /* Wait for something to arrive on the hit list, abort on signal */
+	rv = wait_event_interruptible(kpc->wait_queue, !list_empty(&kpc->hit_list));
+	if (rv< 0)
+		return NULL;
+
+	return kpc_unlink_next(kpc);
+}
+
+static void *kpc_seq_next(struct seq_file *s, void *v, loff_t *pos)
+{
+	struct kprobe_coverage *kpc = s->private;
+
+	/* Returns NULL if there is nothing more to handle */
+	return kpc_unlink_next(kpc);
+}
+
+static void kpc_seq_stop(struct seq_file *s, void *v)
+{
+}
+
+static int kpc_seq_show(struct seq_file *s, void *v)
+{
+	struct kprobe_coverage *kpc = s->private;
+	struct kprobe_coverage_entry *entry = v;
+	const char *module_name;
+	unsigned long addr;
+
+	/* Lookup the module name from the module table */
+	module_name = kpc->module_names[entry->name_index];
+	addr = (unsigned long)entry->kp.addr - entry->base_addr;
+
+	seq_printf(s, "%s%s0x%016lx\n",
+			module_name ? module_name : "",
+			module_name ? ":" : "",
+			addr);
+
+	free_entry(entry);
+
+	return 0;
+}
+
+static struct seq_operations kpc_seq_ops =
+{
+	.start = kpc_seq_start,
+	.next  = kpc_seq_next,
+	.stop  = kpc_seq_stop,
+	.show  = kpc_seq_show
+};
+
+static int kpc_show_open(struct inode *inode, struct file *file)
+{
+	struct kprobe_coverage *kpc = inode->i_private;
+	int rv;
+
+	rv = seq_open(file, &kpc_seq_ops);
+
+	if (rv == 0) {
+		struct seq_file *s = file->private_data;
+
+		s->private = kpc;
+	}
+
+	return rv;
+}
+
+
+static ssize_t kpc_control_write(struct file *file, const char __user *user_buf,
+		size_t count, loff_t *off)
+{
+	struct kprobe_coverage *kpc = file->private_data;
+	ssize_t out = 0;
+	char *line;
+	char *buf;
+	char *p;
+
+	if (count > PAGE_SIZE)
+		return -E2BIG;
+
+	/* Assure it's NULL terminated */
+	buf = (char *)kzalloc(count + 1, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
+	if (copy_from_user(buf, user_buf, count)) {
+		kfree(buf);
+		return -EFAULT;
+	}
+	p = buf;
+
+	while ( (line = strsep(&p, "\r\n")) ) {
+		unsigned long addr;
+		char *module = NULL; /* Assume for the kernel */
+		char *colon;
+		char *addr_p;
+		char *endp;
+
+		if (!*line || !p)
+			break;
+
+		out += p - line;
+
+		if (strcmp(line, "clear") == 0) {
+			kpc_clear(kpc);
+			break;
+		}
+		colon = strstr(line, ":");
+		if (colon) {
+			/* For a module */
+			addr_p = colon + 1;
+			*colon = '\0';
+			module = line;
+		} else
+			addr_p = line;
+
+		addr = simple_strtoul(addr_p, &endp, 16);
+		if (endp == addr_p || *endp != '\0')
+			continue;
+
+		kpc_add_probe(kpc, module, addr);
+	}
+
+	kfree(buf);
+	*off += out;
+
+	return out;
+}
+
+static int kpc_control_open(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private; /* kpc */
+
+	return 0;
+}
+
+static void kpc_handle_coming_module(struct kprobe_coverage *kpc,
+		struct module *mod)
+{
+	struct list_head *iter;
+	struct list_head *tmp;
+
+	mutex_lock(&kpc->lock);
+	list_for_each_safe(iter, tmp, &kpc->deferred_list) {
+		struct kprobe_coverage_entry *entry;
+
+		entry = (struct kprobe_coverage_entry *)container_of(iter,
+				struct kprobe_coverage_entry, lh);
+
+		if (module_name_to_index(kpc, mod->name) != entry->name_index)
+			continue;
+
+		/* Move the deferred entry to the pending list and enable */
+		list_del(&entry->lh);
+		entry->base_addr = (unsigned long)mod->module_core;
+		entry->kp.addr += entry->base_addr;
+
+		if (enable_probe(kpc, entry) < 0)
+			free_entry(entry);
+	}
+	mutex_unlock(&kpc->lock);
+}
+
+static void kpc_handle_going_module(struct kprobe_coverage *kpc,
+		struct module *mod)
+{
+	struct list_head *iter;
+	struct list_head *tmp;
+
+	mutex_lock(&kpc->lock);
+	list_for_each_safe(iter, tmp, &kpc->pending_list) {
+		struct kprobe_coverage_entry *entry;
+
+		entry = (struct kprobe_coverage_entry *)container_of(iter,
+				struct kprobe_coverage_entry, lh);
+
+		if (module_name_to_index(kpc, mod->name) != entry->name_index)
+			continue;
+
+		/* Remove pending entries for the current module */
+		unregister_kprobe(&entry->kp);
+		list_del(&entry->lh);
+		free_entry(entry);
+	}
+	mutex_unlock(&kpc->lock);
+}
+
+static int kpc_module_notifier(struct notifier_block *nb,
+		unsigned long event, void *data)
+{
+	struct module *mod = data;
+
+	if (event == MODULE_STATE_COMING)
+		kpc_handle_coming_module(global_kpc, mod);
+	else if (event == MODULE_STATE_GOING)
+		kpc_handle_going_module(global_kpc, mod);
+
+	return 0;
+}
+
+
+static const struct file_operations kpc_control_fops =
+{
+	.owner = THIS_MODULE,
+	.open = kpc_control_open,
+	.write = kpc_control_write
+};
+
+static const struct file_operations kpc_show_fops =
+{
+	.owner = THIS_MODULE,
+	.open = kpc_show_open,
+	.read = seq_read,
+	.llseek = seq_lseek,
+	.release = seq_release,
+};
+
+
+
+static struct notifier_block kpc_module_notifier_block =
+{
+	.notifier_call = kpc_module_notifier,
+};
+
+static int __init kpc_init(struct kprobe_coverage *kpc)
+{
+	kpc->workqueue = create_singlethread_workqueue("kprobe-coverage");
+
+	if (!kpc->workqueue)
+		return -ENODEV;
+
+	/* Create debugfs entries */
+	kpc->debugfs_root = debugfs_create_dir("kprobe-coverage", NULL);
+	if (!kpc->debugfs_root) {
+		printk(KERN_ERR "kprobe-coverage: creating root dir failed\n");
+		goto out_workqueue;
+	}
+	if (!debugfs_create_file("control", 0200, kpc->debugfs_root, kpc,
+			&kpc_control_fops))
+		goto out_files;
+
+	if (!debugfs_create_file("show", 0400, kpc->debugfs_root, kpc,
+			&kpc_show_fops))
+		goto out_files;
+
+	if (register_module_notifier(&kpc_module_notifier_block) < 0)
+		goto out_files;
+
+	INIT_LIST_HEAD(&kpc->pending_list);
+	INIT_LIST_HEAD(&kpc->hit_list);
+	INIT_LIST_HEAD(&kpc->deferred_list);
+
+	init_waitqueue_head(&kpc->wait_queue);
+	mutex_init(&kpc->lock);
+
+	/* The kernel is always index 0 */
+	kpc->name_count = 1;
+
+	return 0;
+
+out_files:
+	debugfs_remove_recursive(kpc->debugfs_root);
+out_workqueue:
+	destroy_workqueue(kpc->workqueue);
+
+	return -EINVAL;
+}
+
+static int __init kpc_init_module(void)
+{
+	int out;
+
+	global_kpc = kzalloc(sizeof(*global_kpc), GFP_KERNEL);
+	if (!global_kpc)
+		return -ENOMEM;
+
+	out = kpc_init(global_kpc);
+	if (out < 0) {
+		kfree(global_kpc);
+
+		global_kpc = NULL;
+	}
+
+	return out;
+}
+
+static void __exit kpc_exit_module(void)
+{
+	kpc_clear(global_kpc);
+
+	debugfs_remove_recursive(global_kpc->debugfs_root);
+	unregister_module_notifier(&kpc_module_notifier_block);
+	destroy_workqueue(global_kpc->workqueue);
+
+	kfree(global_kpc);
+	global_kpc = NULL;
+}
+
+module_init(kpc_init_module);
+module_exit(kpc_exit_module);
+MODULE_AUTHOR("Simon Kagstrom <simon.kagstrom@gmail.com>");
+MODULE_DESCRIPTION("Code coverage through kprobes and debugfs");
+MODULE_LICENSE("GPL");
diff --git a/kcov-38/src/main-system-daemon.cc b/kcov-38/src/main-system-daemon.cc
new file mode 100644
index 000000000000..d1ef7213d592
--- /dev/null
+++ b/kcov-38/src/main-system-daemon.cc
@@ -0,0 +1,472 @@
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <string>
+#include <unordered_map>
+#include <mutex>
+
+#include <system-mode/registration.hh>
+#include <system-mode/file-data.hh>
+#include <engine.hh>
+#include <utils.hh>
+#include <configuration.hh>
+
+#include "engines/system-mode-file-format.hh"
+
+#include <unordered_map>
+
+using namespace kcov;
+
+static std::mutex outputFileMutex;
+static std::unordered_map<uint32_t, kcov_system_mode::system_mode_memory *> outputFiles;
+
+class ProcessHandler : public IEngine::IEventListener
+{
+public:
+	ProcessHandler(const std::string destinationDir, const std::string &filename, pid_t pid,
+			kcov_system_mode::system_mode_memory *output) :
+		m_filename(filename),
+		m_destinationDir(destinationDir),
+		m_pid(pid),
+		m_engine(NULL),
+		m_output(output),
+		m_id(0)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		conf.setKey("attach-pid", m_pid);
+	}
+
+	virtual ~ProcessHandler()
+	{
+	}
+
+	bool attach(const SystemModeFile *sysFile)
+	{
+		IEngineFactory::IEngineCreator &engineCreator = IEngineFactory::getInstance().matchEngine(m_filename);
+
+		m_engine = engineCreator.create();
+		if (!m_engine)
+		{
+			kcov_debug(INFO_MSG, "Can't create engine\n");
+
+			return false;
+		}
+
+		if (!m_engine->start(*this, m_filename))
+		{
+			kcov_debug(INFO_MSG, "Can't start engine for %s:%d\n", m_filename.c_str(), m_pid);
+
+			return false;
+		}
+
+		const std::vector<uint64_t> &entries = sysFile->getEntries();
+		uint32_t index = 0;
+
+		m_id = sysFile->getId();
+
+		for (std::vector<uint64_t>::const_iterator it = entries.begin();
+				it != entries.end();
+				++it, ++index)
+		{
+			m_indexByAddress[*it] = index;
+			m_engine->registerBreakpoint(*it);
+		}
+
+		return true;
+	}
+
+	void run()
+	{
+		if (!m_output)
+		{
+			panic("Output not created in run(), check implementation\n");
+		}
+
+		while (1)
+		{
+			bool rv = continueExecution();
+
+			// Exit!
+			if (!rv)
+			{
+				break;
+			}
+		}
+	}
+
+	bool continueExecution()
+	{
+		return m_engine->continueExecution();
+	}
+
+private:
+	void onEvent(const IEngine::Event &ev)
+	{
+		// The others are not very interesting
+		if (ev.type == ev_breakpoint)
+		{
+			IndexMap_t::iterator it = m_indexByAddress.find(ev.addr);
+
+			if (it != m_indexByAddress.end())
+			{
+				m_output->reportIndex(it->second);
+			}
+		}
+	}
+
+
+	const std::string m_reportFilename;
+	const std::string m_filename;
+	const std::string m_destinationDir;
+
+	pid_t m_pid;
+	IEngine *m_engine;
+
+	typedef std::unordered_map<uint64_t, uint32_t> IndexMap_t;
+	IndexMap_t m_indexByAddress;
+
+	kcov_system_mode::system_mode_memory *m_output;
+	uint32_t m_id;
+};
+
+static SystemModeFile *getSystemModeFileFromFilename(const std::string &m_filename)
+{
+	size_t sz;
+	void *p;
+
+	p = read_file(&sz, "%s", m_filename.c_str());
+	if (!p)
+	{
+		kcov_debug(INFO_MSG, "Can't read %s\n", m_filename.c_str());
+
+		return NULL;
+	}
+
+	SystemModeFile *sysFile = SystemModeFile::fromProcessedFile(p, sz);
+	free(p);
+
+	if (!sysFile)
+	{
+		kcov_debug(INFO_MSG, "Can't unmarshal %s\n", m_filename.c_str());
+
+		return NULL;
+	}
+
+	return sysFile;
+}
+
+static void processOne(const std::string &destinationDir, const std::string &filename, pid_t pid)
+{
+	Semaphore sem(0);
+
+	SystemModeFile *sysFile = getSystemModeFileFromFilename(filename);
+	if (!sysFile)
+	{
+		return;
+	}
+
+	// Create output memory representation (mmap:ed)
+	outputFileMutex.lock();
+	kcov_system_mode::system_mode_memory *output = outputFiles[sysFile->getId()];
+	if (!output)
+	{
+		output = new kcov_system_mode::system_mode_memory(sysFile->getFilename(), sysFile->getOptions(), sysFile->getEntries().size());
+		outputFiles[sysFile->getId()] = output;
+	}
+	outputFileMutex.unlock();
+
+
+	// Create a child and process everything there
+	pid_t child = fork();
+	if (child < 0)
+	{
+		kcov_debug(INFO_MSG, "Can't fork?");
+
+		delete sysFile;
+		return;
+	}
+	else if (child == 0)
+	{
+		// Child
+		ProcessHandler handler(destinationDir, filename, pid, output);
+
+		// Parse and run!
+		bool ok = handler.attach(sysFile);
+		if (ok)
+		{
+			// Awake the process in open() for the readback FIFO
+			handler.continueExecution();
+			sem.notify();
+			handler.run();
+		}
+		else
+		{
+			sem.notify();
+		}
+
+		exit(0);
+	}
+	else
+	{
+		// Parent, wait until attached
+		sem.wait();
+	}
+
+	delete sysFile;
+}
+
+
+// https://stackoverflow.com/questions/1486833/pthread-cond-timedwait-help
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static void waitCond(unsigned secs)
+{
+    struct timespec timeToWait;
+    struct timeval now;
+
+    gettimeofday(&now,NULL);
+
+    timeToWait.tv_sec = now.tv_sec + secs;
+    timeToWait.tv_nsec = now.tv_usec;
+
+    pthread_mutex_lock(&mutex);
+    pthread_cond_timedwait(&cond, &mutex, &timeToWait);
+    pthread_mutex_unlock(&mutex);
+}
+
+static bool doExit = false;
+static void onExitSignal(int sig)
+{
+	// Forward the signal to the traced program
+	doExit = true;
+	pthread_cond_signal(&cond);
+}
+
+static void *outputThread(void *p)
+{
+	std::string *in = (std::string *)p;
+	std::string destinationDir = *in;
+
+	(void)mkdir(destinationDir.c_str(), 0755);
+
+	while (1)
+	{
+		// Write data every two seconds
+		waitCond(2);
+
+		if (doExit)
+		{
+			break;
+		}
+
+		// Copy to a list to process
+		std::vector<std::pair<uint32_t, kcov_system_mode::system_mode_memory *>> toProcess;
+		outputFileMutex.lock();
+		for (std::unordered_map<uint32_t, kcov_system_mode::system_mode_memory *>::iterator it = outputFiles.begin();
+				it != outputFiles.end();
+				++it)
+		{
+			toProcess.push_back(std::pair<uint32_t, kcov_system_mode::system_mode_memory *>(it->first, it->second));
+		}
+		outputFileMutex.unlock();
+
+		for (std::vector<std::pair<uint32_t, kcov_system_mode::system_mode_memory *>>::iterator it = toProcess.begin();
+				it != toProcess.end();
+				++it)
+		{
+			kcov_system_mode::system_mode_memory *cur = it->second;
+
+			// Not changed, don't write
+			if (!cur->isDirty())
+			{
+				continue;
+			}
+			// Mark as clean and write the data
+			cur->markClean();
+
+
+			size_t size;
+			struct kcov_system_mode::system_mode_file *dst = kcov_system_mode::memoryToFile(*cur, size);
+
+			if (!dst)
+			{
+				error("system-mode-daemon: Can't marshal data\n");
+				continue;
+			}
+
+			std::string out = fmt("%s/%08lx", destinationDir.c_str(), (long)it->first);
+			FILE *fp = fopen(out.c_str(), "w");
+
+			if (fp)
+			{
+				fwrite(dst, 1, size, fp);
+				fclose(fp);
+			}
+			else
+			{
+				fprintf(stderr, "kcov-binary-lib: Can't write outfile\n");
+			}
+
+			free(dst);
+		}
+	}
+
+	return NULL;
+}
+
+// https://stackoverflow.com/questions/17954432/creating-a-daemon-in-linux/17955149#17955149
+static void daemonize(void)
+{
+	pid_t child;
+
+	child = fork();
+
+	if (child < 0)
+	{
+		panic("Fork failed?\n");
+	}
+	else if (child > 0)
+	{
+		// Parent
+		exit(0);
+	}
+	if (setsid() < 0)
+	{
+		exit(1);
+	}
+
+	// Ignore signals
+	signal(SIGCHLD, SIG_IGN);
+    signal(SIGHUP, SIG_IGN);
+
+	child = fork();
+
+	if (child < 0)
+	{
+		panic("Fork failed?\n");
+	}
+	else if (child > 0)
+	{
+		// Parent
+		exit(0);
+	}
+
+	close(fileno(stdin));
+	close(fileno(stderr));
+	close(fileno(stdout));
+}
+
+
+int main(int argc, const char *argv[])
+{
+	std::string pidFile = "/tmp/kcov-system.pid";
+
+	if (file_exists(pidFile))
+	{
+		fprintf(stderr, "%s already exists, indicating an already running daemon\n"
+				"Remove the file if this is incorrect\n", pidFile.c_str());
+		exit(1);
+	}
+
+	const char *path = getenv("KCOV_SYSTEM_DESTINATION_DIR");
+	if (argc == 2 && strcmp(argv[1], "-d") == 0)
+	{
+		daemonize();
+	}
+
+	// Create PID-file
+	char pid[256];
+	snprintf(pid, sizeof(pid), "%d", getpid());
+	write_file(pid, strlen(pid) + 1, "%s", pidFile.c_str());
+
+	std::string destinationDir = "/tmp/kcov-data";
+
+	if (path)
+		destinationDir = path;
+
+	(void)::mkdir(destinationDir.c_str(), 0755);
+
+	const char *pipePath = "/tmp/kcov-system.pipe";
+	(void)::mkfifo(pipePath, 0644);
+
+	int fd = ::open(pipePath, O_RDONLY);
+	if (fd < 0)
+	{
+		fprintf(stderr, "Can't open fifo %s\n", pipePath);
+		unlink(pidFile.c_str());
+		exit(1);
+	}
+
+	// Catch Cltr-C and kill
+	signal(SIGINT, onExitSignal);
+	signal(SIGTERM, onExitSignal);
+
+	pthread_t thread;
+	pthread_create(&thread, NULL, outputThread, (void *)&destinationDir);
+
+	while (1)
+	{
+		char buf[4096];
+
+		if (doExit)
+		{
+			break;
+		}
+
+		memset(buf, 0, sizeof(buf));
+		int r = ::read(fd, buf, sizeof(buf));
+
+		if (r <= 0)
+		{
+			continue;
+		}
+
+		// Handle stopping requests
+		std::string stopCommand = "STOPME";
+		if (r >= (int)stopCommand.size() &&
+				strncmp(stopCommand.c_str(), buf, stopCommand.size()) == 0)
+		{
+			doExit = 1;
+			continue;
+		}
+
+		if (r < (int)sizeof(struct new_process_entry))
+		{
+			continue;
+		}
+
+		uint16_t pid;
+		std::string entryFilename;
+
+		struct new_process_entry *p = (struct new_process_entry *)buf;
+
+		if (!parseProcessEntry(p, pid, entryFilename))
+		{
+			continue;
+		}
+
+		processOne(destinationDir, entryFilename, pid);
+
+		// Write a character to let the process loose again
+		write_file(buf, 1, "%s/%d", destinationDir.c_str(), pid);
+	}
+	pthread_cond_signal(&cond);
+
+	// Wait for the reporter thread
+	void *rv;
+	pthread_join(thread, &rv);
+
+	close(fd);
+	unlink(pipePath);
+	unlink(pidFile.c_str());
+}
diff --git a/kcov-38/src/main.cc b/kcov-38/src/main.cc
new file mode 100644
index 000000000000..f81db9c11076
--- /dev/null
+++ b/kcov-38/src/main.cc
@@ -0,0 +1,579 @@
+#include <configuration.hh>
+#include <engine.hh>
+#include <reporter.hh>
+#include <writer.hh>
+#include <collector.hh>
+#include <filter.hh>
+#include <output-handler.hh>
+#include <file-parser.hh>
+#include <solib-handler.hh>
+#include <generated-data-base.hh>
+#include <utils.hh>
+
+#include <string.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <unistd.h>
+
+#include "merge-parser.hh"
+#include "engines/system-mode-file-format.hh"
+#include "writers/html-writer.hh"
+#include "writers/json-writer.hh"
+#include "writers/coveralls-writer.hh"
+#include "writers/cobertura-writer.hh"
+#include "writers/sonarqube-xml-writer.hh"
+
+using namespace kcov;
+
+extern GeneratedData kcov_system_library_data;
+
+static IEngine *g_engine;
+static IOutputHandler *g_output;
+static ICollector *g_collector;
+static IReporter *g_reporter;
+static ISolibHandler *g_solibHandler;
+static IFilter *g_filter;
+static IFilter *g_basicFilter;
+
+static void do_cleanup()
+{
+	delete g_collector;
+	delete g_output;
+	delete g_reporter;
+	delete g_solibHandler; // Before the engine since a SIGTERM is sent to the thread
+	delete g_engine;
+	delete g_filter;
+	delete g_basicFilter;
+}
+
+static void ctrlc(int sig)
+{
+	// Forward the signal to the traced program
+	g_engine->kill(sig);
+}
+
+static void daemonize(void)
+{
+	pid_t child;
+	int res;
+
+	IConfiguration &conf = IConfiguration::getInstance();
+	std::string fifoName = conf.keyAsString("target-directory") + "/done.fifo";
+
+	unlink(fifoName.c_str());
+	res = mkfifo(fifoName.c_str(), 0600);
+
+	panic_if(res < 0, "Can't create FIFO");
+
+	child = fork();
+
+	if (child < 0)
+	{
+		panic("Fork failed?\n");
+	}
+	else if (child == 0)
+	{
+		child = fork();
+
+		if (child < 0)
+		{
+			panic("Fork failed?\n");
+		}
+		else if (child > 0)
+		{
+			// Second parent
+			exit(0);
+		}
+	}
+	else
+	{
+		// Parent
+		FILE *fp;
+		char buf[255];
+		char *endp;
+		char *p;
+		unsigned long out;
+
+		fp = fopen(fifoName.c_str(), "r");
+		panic_if(!fp, "Can't open FIFO");
+		p = fgets(buf, sizeof(buf), fp);
+		panic_if(!p, "Can't read FIFO");
+
+		out = strtoul(p, &endp, 10);
+		if (p == endp)
+			out = 0;
+
+		exit(out);
+	}
+}
+
+// Return the number of metadata directories in the kcov output path
+unsigned int countMetadata()
+{
+	IConfiguration &conf = IConfiguration::getInstance();
+	std::string base = conf.keyAsString("out-directory");
+	DIR *dir;
+	struct dirent *de;
+
+	dir = ::opendir(base.c_str());
+	if (!dir)
+		return 0;
+
+	unsigned int out = 0;
+
+	// Count metadata directories
+	for (de = ::readdir(dir); de; de = ::readdir(dir))
+	{
+		std::string name = de->d_name;
+		std::string cur = base + name + "/metadata";
+		std::string binaryName = conf.keyAsString("binary-name");
+
+		// ... except for the current coveree and coveree.CHECKSUM
+		if (binaryName == name
+				|| (name.size() > binaryName.size()
+						&& name.find(binaryName) == 0
+						&& name[binaryName.size()] == '.'))
+			continue;
+
+		DIR *metadataDir;
+		struct dirent *de2;
+
+		metadataDir = ::opendir(cur.c_str());
+		if (!metadataDir)
+			continue;
+
+		// Count metadata files
+		unsigned int datum = 0;
+		for (de2 = ::readdir(metadataDir); de2; de2 = ::readdir(metadataDir))
+		{
+			if (de2->d_name[0] == '.')
+				continue;
+
+			datum++;
+		}
+		out += !!datum;
+		::closedir(metadataDir);
+	}
+	::closedir(dir);
+
+	return out;
+}
+
+/*
+ * Run in merge-mode, i.e., run kcov on previously generated coverage runs and
+ * create a common merged output from them.
+ */
+static int runMergeMode()
+{
+	IFilter &filter = IFilter::create();
+	IReporter &reporter = IReporter::createDummyReporter();
+	IOutputHandler &output = IOutputHandler::create(reporter, NULL);
+	IConfiguration &conf = IConfiguration::getInstance();
+
+	const std::string &base = output.getBaseDirectory();
+	const std::string &out = output.getOutDirectory();
+
+	IMergeParser &mergeParser = createMergeParser(reporter, base, out, filter);
+	IReporter &mergeReporter = IReporter::create(mergeParser, mergeParser,
+			filter);
+	IWriter &mergeHtmlWriter = createHtmlWriter(mergeParser, mergeReporter,
+			base, base + "/kcov-merged", conf.keyAsString("merged-name"), true);
+	IWriter &mergeJsonWriter = createJsonWriter(mergeParser, mergeReporter,
+			base + "kcov-merged/coverage.json");
+	IWriter &mergeCoberturaWriter = createCoberturaWriter(mergeParser,
+			mergeReporter, base + "kcov-merged");
+	IWriter &mergeSonarqubeWriter = createSonarqubeWriter(mergeParser,
+			mergeReporter, base + "kcov-merged/sonarqube.xml");
+	IWriter &mergeCoverallsWriter = createCoverallsWriter(mergeParser,
+			mergeReporter);
+	(void) mkdir(fmt("%s/kcov-merged", base.c_str()).c_str(), 0755);
+
+	output.registerWriter(mergeParser);
+	output.registerWriter(mergeHtmlWriter);
+	output.registerWriter(mergeJsonWriter);
+	output.registerWriter(mergeCoberturaWriter);
+	output.registerWriter(mergeSonarqubeWriter);
+	output.registerWriter(mergeCoverallsWriter);
+
+	output.start();
+	output.stop();
+
+	mergeReporter.writeCoverageDatabase();
+	delete &output;
+
+	return 0;
+}
+
+static int runKcov(IConfiguration::RunMode_t runningMode)
+{
+	IConfiguration &conf = IConfiguration::getInstance();
+
+	std::string file = conf.keyAsString("binary-path")
+			+ conf.keyAsString("binary-name");
+	IFileParser *parser = IParserManager::getInstance().matchParser(file);
+	if (!parser)
+	{
+		error("Can't find or open %s\n", file.c_str());
+		return 1;
+	}
+
+	// Match and create an engine
+	IEngineFactory::IEngineCreator &engineCreator =
+			IEngineFactory::getInstance().matchEngine(file);
+	IEngine *engine = engineCreator.create();
+	if (!engine)
+	{
+		conf.printUsage();
+		return 1;
+	}
+
+	IFilter &filter = IFilter::create();
+	IFilter &basicFilter = IFilter::createBasic();
+
+	ICollector &collector = ICollector::create(*parser, *engine, filter);
+	IReporter &reporter = IReporter::create(*parser, collector, filter);
+	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
+	ISolibHandler &solibHandler = createSolibHandler(*parser, collector);
+
+	parser->addFile(file);
+
+	// Register writers
+	if (runningMode != IConfiguration::MODE_COLLECT_ONLY)
+	{
+		const std::string &base = output.getBaseDirectory();
+		const std::string &out = output.getOutDirectory();
+
+		IWriter &htmlWriter = createHtmlWriter(*parser, reporter, base, out,
+				conf.keyAsString("binary-name"));
+		IWriter &jsonWriter = createJsonWriter(*parser, reporter,
+				out + "/coverage.json");
+		IWriter &coberturaWriter = createCoberturaWriter(*parser, reporter,
+				out);
+		IWriter &sonarqubeWriter = createSonarqubeWriter(*parser, reporter,
+				out + "/sonarqube.xml");
+
+		// The merge parser is both a parser, a writer and a collector (!)
+		IMergeParser &mergeParser = createMergeParser(reporter, base, out,
+				filter);
+		IReporter &mergeReporter = IReporter::create(mergeParser, mergeParser,
+				basicFilter);
+		IWriter &mergeHtmlWriter = createHtmlWriter(mergeParser, mergeReporter,
+				base, base + "/kcov-merged", conf.keyAsString("merged-name"),
+				false);
+		IWriter &mergeJsonWriter = createJsonWriter(mergeParser, mergeReporter,
+				base + "kcov-merged/coverage.json");
+		IWriter &mergeCoberturaWriter = createCoberturaWriter(mergeParser,
+				mergeReporter, base + "kcov-merged");
+		IWriter &mergeSonarqubeWriter = createSonarqubeWriter(mergeParser,
+				mergeReporter, base + "kcov-merged/sonarqube.xml");
+		(void) mkdir(fmt("%s/kcov-merged", base.c_str()).c_str(), 0755);
+
+		reporter.registerListener(mergeParser);
+
+		output.registerWriter(mergeParser);
+
+		// Multiple binaries? Register the merged mode stuff
+		if (countMetadata() > 0)
+		{
+			output.registerWriter(mergeHtmlWriter);
+			output.registerWriter(mergeJsonWriter);
+			output.registerWriter(mergeCoberturaWriter);
+			output.registerWriter(mergeSonarqubeWriter);
+			output.registerWriter(
+					createCoverallsWriter(mergeParser, mergeReporter));
+		}
+		else
+		{
+			output.registerWriter(createCoverallsWriter(*parser, reporter));
+		}
+
+		output.registerWriter(htmlWriter);
+		output.registerWriter(jsonWriter);
+		output.registerWriter(coberturaWriter);
+		output.registerWriter(sonarqubeWriter);
+	}
+
+	g_engine = engine;
+	g_output = &output;
+	g_reporter = &reporter;
+	g_collector = &collector;
+	g_solibHandler = &solibHandler;
+	g_filter = &filter;
+	g_basicFilter = &basicFilter;
+	signal(SIGINT, ctrlc);
+	signal(SIGTERM, ctrlc);
+
+	if (conf.keyAsInt("daemonize-on-first-process-exit"))
+		daemonize();
+
+	parser->setupParser(&filter);
+	output.start();
+	solibHandler.startup();
+
+	int ret = 0;
+
+	if (runningMode != IConfiguration::MODE_REPORT_ONLY)
+	{
+		ret = collector.run(file);
+	}
+	else
+	{
+		parser->parse();
+	}
+
+	do_cleanup();
+
+	return ret;
+}
+
+static int runSystemModeRecordFile(const std::string &dir,
+		const std::string &file, mode_t dirMode, mode_t mode)
+{
+	pid_t child = fork();
+	if (child < 0)
+	{
+		panic("Fork failed?\n");
+	}
+	else if (child == 0)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		std::string rootDir = conf.keyAsString("binary-path")
+				+ conf.keyAsString("binary-name");
+
+		if (dir.size() < rootDir.size())
+		{
+			error("kcov: Something strange with the directories: %s vs %s\n",
+					dir.c_str(), rootDir.c_str());
+			return -1;
+		}
+
+		std::string dstDir = dir_concat(conf.keyAsString("out-directory"),
+				dir.substr(rootDir.size()));
+		std::string dstFile = dir_concat(conf.keyAsString("out-directory"),
+				file.substr(rootDir.size()));
+
+		conf.setKey("system-mode-write-file", dstFile);
+		conf.setKey("system-mode-write-file-mode", mode & 07777);
+		conf.setKey("binary-name", file);
+		conf.setKey("binary-path", ""); // file uses an absolute path
+
+		(void) mkdir(dstDir.c_str(), dirMode & 07777);
+
+		runKcov(IConfiguration::MODE_COLLECT_ONLY);
+		exit(0);
+	}
+	else
+	{
+		// Parent
+		int status;
+
+		::waitpid(child, &status, 0);
+	}
+
+	return 0;
+}
+
+static int runSystemModeRecordDirectory(const std::string &base, mode_t mode)
+{
+	DIR *dir = ::opendir(base.c_str());
+	if (!dir)
+	{
+		error("Can't open directory %s\n", base.c_str());
+		return -1;
+	}
+
+	// Loop through the directory structure
+	struct dirent *de;
+	for (de = ::readdir(dir); de; de = ::readdir(dir))
+	{
+		std::string cur = base + "/" + de->d_name;
+
+		if (strcmp(de->d_name, ".") == 0)
+			continue;
+
+		if (strcmp(de->d_name, "..") == 0)
+			continue;
+
+		struct stat st;
+
+		if (lstat(cur.c_str(), &st) < 0)
+			continue;
+
+		if (S_ISDIR(st.st_mode))
+		{
+			runSystemModeRecordDirectory(cur, st.st_mode);
+		}
+		else if (S_ISREG(st.st_mode)
+				&& (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+		{
+			// Executable file?
+			runSystemModeRecordFile(base, cur, mode, st.st_mode);
+		}
+	}
+	::closedir(dir);
+
+	return 0;
+}
+
+static int runSystemModeRecord()
+{
+	IConfiguration &conf = IConfiguration::getInstance();
+
+	std::string base = conf.keyAsString("binary-path")
+			+ conf.keyAsString("binary-name");
+	std::string out = conf.keyAsString("out-directory");
+	std::string lib = out + "/lib";
+
+	umask(~0777);
+	(void) mkdir(out.c_str(), 0755);
+	(void) mkdir(lib.c_str(), 0755);
+
+	std::string library = fmt("%s/libkcov_system.so", lib.c_str());
+
+	if (write_file(kcov_system_library_data.data(),
+			kcov_system_library_data.size(), "%s", library.c_str()) < 0)
+	{
+		error("Can't write binary library at %s", library.c_str());
+
+		return -1;
+	}
+	if (chmod(library.c_str(), 0755) < 0)
+	{
+		error("Can't chmod??\n");
+	}
+
+	return runSystemModeRecordDirectory(base, 0755);
+}
+
+std::vector<std::string> optionsStringToConfigurationVector(
+		const std::string &in)
+{
+	std::vector<std::string> parts = split_string(in, " ");
+	if (parts.size() != 6)
+	{
+		warning("Options vector is not correct: '%s' splits into %zu\n",
+				in.c_str(), parts.size());
+		return std::vector<std::string>();
+	}
+
+	return parts;
+}
+
+static int runSystemModeReportFile(const std::string &file)
+{
+	kcov_system_mode::system_mode_memory *data = kcov_system_mode::diskToMemory(
+			file);
+
+	if (!data)
+	{
+		return -1;
+	}
+
+	pid_t child = fork();
+	if (child < 0)
+	{
+		panic("Fork failed?\n");
+	}
+	else if (child == 0)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		std::pair<std::string, std::string> both = split_path(data->filename); // absolute path
+
+		conf.setKey("system-mode-read-results-file", file);
+		conf.setKey("binary-name", both.second);
+		conf.setKey("binary-path", both.first);
+		conf.setKey("target-directory",
+				conf.keyAsString("out-directory") + "/" + both.second);
+
+		std::vector<std::string> options = optionsStringToConfigurationVector(
+				data->options);
+		if (options.size() == 6)
+		{
+			conf.setKey("include-pattern", options[0]);
+			conf.setKey("exclude-pattern", options[1]);
+			conf.setKey("include-path", options[2]);
+			conf.setKey("exclude-path", options[3]);
+			conf.setKey("exclude-line", options[4]);
+			conf.setKey("exclude-region", options[5]);
+		}
+
+		runKcov(IConfiguration::MODE_COLLECT_AND_REPORT);
+		exit(0);
+	}
+	else
+	{
+		// Parent
+		int status;
+
+		::waitpid(child, &status, 0);
+	}
+
+	delete data;
+
+	return 0;
+}
+
+static int runSystemModeReportDirectory(const std::string &base)
+{
+	DIR *dir = ::opendir(base.c_str());
+	if (!dir)
+	{
+		error("Can't open directory %s\n", base.c_str());
+		return -1;
+	}
+
+	// Loop through the directory structure
+	struct dirent *de;
+	for (de = ::readdir(dir); de; de = ::readdir(dir))
+	{
+		std::string cur = base + "/" + de->d_name;
+		struct stat st;
+
+		if (lstat(cur.c_str(), &st) < 0)
+			continue;
+
+		// Executable file?
+		if (S_ISREG(st.st_mode))
+		{
+			runSystemModeReportFile(cur);
+		}
+	}
+	::closedir(dir);
+
+	return 0;
+}
+
+static int runSystemModeReport()
+{
+	IConfiguration &conf = IConfiguration::getInstance();
+
+	std::string base = conf.keyAsString("binary-path")
+			+ conf.keyAsString("binary-name");
+
+	return runSystemModeReportDirectory(base);
+}
+
+int main(int argc, const char *argv[])
+{
+	IConfiguration &conf = IConfiguration::getInstance();
+
+	if (!conf.parse(argc, argv))
+		return 1;
+
+	IConfiguration::RunMode_t runningMode =
+			(IConfiguration::RunMode_t) conf.keyAsInt("running-mode");
+
+	if (runningMode == IConfiguration::MODE_MERGE_ONLY)
+		return runMergeMode();
+
+	if (runningMode == IConfiguration::MODE_SYSTEM_RECORD)
+		return runSystemModeRecord();
+
+	if (runningMode == IConfiguration::MODE_SYSTEM_REPORT)
+		return runSystemModeReport();
+
+	return runKcov(runningMode);
+}
diff --git a/kcov-38/src/merge-file-parser.cc b/kcov-38/src/merge-file-parser.cc
new file mode 100644
index 000000000000..f91d39c8bae6
--- /dev/null
+++ b/kcov-38/src/merge-file-parser.cc
@@ -0,0 +1,616 @@
+#include <file-parser.hh>
+#include <collector.hh>
+#include <utils.hh>
+#include <filter.hh>
+#include <writer.hh>
+#include <configuration.hh>
+
+#include <vector>
+#include <string>
+#include <list>
+#include <unordered_map>
+#include <map>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <swap-endian.hh>
+
+#include "merge-parser.hh"
+
+using namespace kcov;
+
+#define MERGE_MAGIC   0x4d6f6172 // "Moar"
+#define MERGE_VERSION 4
+
+struct line_entry
+{
+	uint32_t line;
+	uint32_t address_start;
+	uint32_t n_addresses;
+};
+
+struct file_data
+{
+	uint32_t magic;
+	uint32_t version;
+	uint32_t size;
+	uint32_t checksum;
+	uint64_t timestamp;
+	uint32_t n_entries;
+	uint32_t address_table_offset;
+	uint32_t file_name_offset;
+
+	struct line_entry entries[];
+};
+
+// Unit test stuff
+namespace merge_parser
+{
+class marshal;
+class output;
+class input;
+}
+
+class MergeParser: public IMergeParser
+{
+public:
+	friend class merge_parser::marshal;
+	friend class merge_parser::output;
+	friend class merge_parser::input;
+
+	MergeParser(IReporter &reporter, const std::string &baseDirectory, const std::string &outputDirectory, IFilter &filter) :
+			m_baseDirectory(baseDirectory), m_outputDirectory(outputDirectory), m_filter(filter)
+	{
+		reporter.registerListener(*this);
+	}
+
+	~MergeParser()
+	{
+		for (FileByNameMap_t::iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *cur = it->second;
+
+			delete cur;
+		}
+
+		m_files.clear();
+	}
+
+	// From IFileParser
+	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
+	{
+		return true;
+	}
+
+	virtual bool setMainFileRelocation(unsigned long relocation)
+	{
+		return true;
+	}
+
+	virtual void registerLineListener(IFileParser::ILineListener &listener)
+	{
+		m_lineListeners.push_back(&listener);
+	}
+
+	// Unused ...
+	virtual void registerFileListener(IFileParser::IFileListener &listener)
+	{
+	}
+
+	virtual bool parse()
+	{
+		return true;
+	}
+
+	virtual uint64_t getChecksum()
+	{
+		return 0;
+	}
+
+	std::string getParserType()
+	{
+		return "merge";
+	}
+
+	enum IFileParser::PossibleHits maxPossibleHits()
+	{
+		return IFileParser::HITS_SINGLE; // Hits from multiple binaries
+	}
+
+	void setupParser(IFilter *filter)
+	{
+	}
+
+	// ... to here
+	virtual unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		return match_none;
+	}
+
+	// From IReporter::IListener
+	void onAddress(uint64_t addr, unsigned long hits)
+	{
+		if (m_fileLineByAddress.find(addr) == m_fileLineByAddress.end())
+		{
+			m_pendingHits[addr] = hits;
+			return;
+		}
+
+		addr = m_fileLineByAddress[addr];
+
+		File *file = m_filesByAddress[addr];
+
+		if (!file)
+			return;
+
+		file->registerHits(addr, hits);
+
+		for (CollectorListenerList_t::const_iterator it = m_collectorListeners.begin(); it != m_collectorListeners.end();
+				++it)
+			(*it)->onAddressHit(addr, hits);
+	}
+
+	// From IReporter::IListener
+	virtual void onLineReporter(const std::string &filename, unsigned int lineNr, uint64_t addr)
+	{
+		if (!m_filter.runFilters(filename))
+		{
+			return;
+		}
+
+		// Nothing to do in that case
+		if (!file_exists(filename))
+			return;
+
+		File *file;
+
+		file = m_files[filename];
+		if (!file)
+		{
+			file = new File(filename);
+
+			m_files[filename] = file;
+		}
+
+		uint64_t addrHash = hashAddress(filename, lineNr, addr) & ~(1ULL << 63);
+
+		m_fileLineByAddress[addr] = addrHash;
+
+		// Mark as a local file
+		file->setLocal();
+		file->addLine(lineNr, addrHash);
+
+		// Record this for the collector hits
+		m_filesByAddress[addrHash] = file;
+
+		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
+			(*it)->onLine(filename, lineNr, addrHash);
+
+		/*
+		 * Visit pending addresses for this file/line. onAddress gets a non-
+		 * hashed address, so replicate that behavior here.
+		 */
+		AddrToHitsMap_t::iterator pend = m_pendingHits.find(addr);
+		if (pend != m_pendingHits.end())
+		{
+			onAddress(addr, pend->second);
+
+			m_pendingHits.erase(addr);
+		}
+	}
+
+	// From IWriter
+	void onStartup()
+	{
+		(void) mkdir(m_baseDirectory.c_str(), 0755);
+		(void) mkdir(m_outputDirectory.c_str(), 0755);
+		(void) mkdir(fmt("%s/metadata", m_outputDirectory.c_str()).c_str(), 0755);
+	}
+
+	void onStop()
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		bool inMergeMode = conf.keyAsInt("running-mode") == IConfiguration::MODE_MERGE_ONLY;
+
+		// Parse data from earlier runs
+		if (inMergeMode)
+			parseStoredDataMerged();
+		else
+			parseStoredData();
+
+		/* Produce something like
+		 *
+		 *   /tmp/kcov/calc/metadata/4f332bca
+		 *   /tmp/kcov/calc/metadata/cd9932a1
+		 *
+		 * For all the files we've covered. The output filename comes from a hash of
+		 * the input filename.
+		 */
+		for (FileByNameMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			/*
+			 *  Only marshal local files, except when in merged mode - then all files
+			 *  are local (or none, depending on how you see it).
+			 */
+			if (!inMergeMode && !it->second->m_local)
+				continue;
+
+			const struct file_data *fd = marshalFile(it->second->m_filename);
+
+			if (!fd)
+				continue;
+
+			uint32_t crc = hash_block((const void *) it->second->m_filename.c_str(), it->second->m_filename.size());
+			std::string name = fmt("%08x", crc);
+
+			write_file((const void *) fd, be_to_host<uint32_t>(fd->size), "%s/metadata/%s", m_outputDirectory.c_str(),
+					name.c_str());
+
+			free((void *) fd);
+		}
+	}
+
+	void write()
+	{
+	}
+
+	// From ICollector
+	virtual void registerListener(ICollector::IListener &listener)
+	{
+		m_collectorListeners.push_back(&listener);
+	}
+
+	virtual void registerEventTickListener(ICollector::IEventTickListener &listener)
+	{
+	}
+
+	virtual int run(const std::string &filename)
+	{
+		// Not used
+		panic("Should not call run here");
+
+		return 0;
+	}
+
+private:
+	uint64_t hashAddress(const std::string &filename, unsigned int lineNr, uint64_t addr)
+	{
+		// Convert address into a suitable format for the merge parser
+		uint64_t addrHash = (uint64_t) hash_block(filename.c_str(), filename.size()) | ((uint64_t) lineNr << 32ULL);
+
+		return addrHash;
+	}
+
+	void parseStoredData()
+	{
+		DIR *dir;
+		struct dirent *de;
+
+		dir = opendir(m_baseDirectory.c_str());
+		panic_if(!dir, "Can't open directory %s\n", m_baseDirectory.c_str());
+
+		// Unmarshal and parse all metadata
+		for (de = readdir(dir); de; de = readdir(dir))
+		{
+			std::string cur = m_baseDirectory + de->d_name;
+
+			// ... except for the current coveree
+			if (cur == m_outputDirectory)
+				continue;
+
+			parseDirectory(cur);
+		}
+		closedir(dir);
+	}
+
+	void parseStoredDataMerged()
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		const char **argv = conf.getArgv();
+		unsigned int argc = conf.getArgc();
+
+		// argv[] contains the directories to merge
+		for (unsigned int i = 0; i < argc; i++)
+		{
+			DIR *dir;
+			struct dirent *de;
+
+			dir = opendir(argv[i]);
+
+			if (!dir)
+			{
+				warning("kcov: Can't open directory %s\n", argv[i]);
+				continue;
+			}
+
+			// Unmarshal and parse all metadata
+			for (de = readdir(dir); de; de = readdir(dir))
+			{
+				std::string cur = fmt("%s/%s", argv[i], de->d_name);
+
+				parseDirectory(cur);
+			}
+			closedir(dir);
+		}
+	}
+
+	void parseDirectory(const std::string &dirName)
+	{
+		DIR *dir;
+		struct dirent *de;
+		std::string metadataDirName = dirName + "/metadata";
+
+		dir = opendir(metadataDirName.c_str());
+		// Can occur naturally
+		if (!dir)
+			return;
+
+		// Read all metadata from the directory
+		for (de = readdir(dir); de; de = readdir(dir))
+			parseOne(metadataDirName, de->d_name);
+
+		closedir(dir);
+	}
+
+	void parseOne(const std::string &metadataDirName, const std::string &curFile)
+	{
+		size_t size;
+
+		// Not as hash?
+		if (!string_is_integer(curFile, 16))
+			return;
+
+		struct file_data *fd = (struct file_data *)read_file(&size, "%s/%s", metadataDirName.c_str(), curFile.c_str());
+		if (!fd)
+			return;
+
+		if (size >= sizeof(struct file_data) && unMarshalFile(fd))
+		{
+			parseFileData(fd);
+		}
+
+		free(fd);
+	}
+
+	void parseFileData(struct file_data *fd)
+	{
+		std::string filename((const char *) fd + fd->file_name_offset);
+
+		filename = m_filter.mangleSourcePath(filename);
+
+		// File has been removed since last test
+		if (!file_exists(filename))
+			return;
+
+		File *file;
+
+		file = m_files[filename];
+		if (!file)
+		{
+			file = new File(filename);
+
+			m_files[filename] = file;
+		}
+		else
+		{
+			// Checksum doesn't match, ignore this file
+			if (file->m_checksum != fd->checksum)
+				return;
+		}
+
+		uint64_t *addrTable = (uint64_t *) ((char *) fd + fd->address_table_offset);
+		for (unsigned i = 0; i < fd->n_entries; i++)
+		{
+			uint32_t lineNr = fd->entries[i].line;
+
+			for (unsigned ia = 0; ia < fd->entries[i].n_addresses; ia++)
+			{
+				uint64_t addr = addrTable[fd->entries[i].address_start + ia];
+
+				// Check if this was a hit (and remove the hit bit from the address)
+				bool hit = (addr & (1ULL << 63));
+				addr &= ~(1ULL << 63);
+
+				file->addLine(lineNr, addr);
+
+				for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
+					(*it)->onLine(filename, lineNr, addr & ~(1ULL << 63));
+
+				// Register and report the hit
+				if (hit)
+				{
+					file->registerHits(addr, 1);
+
+					for (CollectorListenerList_t::const_iterator itC = m_collectorListeners.begin();
+							itC != m_collectorListeners.end(); ++itC)
+						(*itC)->onAddressHit(addr, 1);
+				}
+			}
+		}
+	}
+
+	const struct file_data *marshalFile(const std::string &filename)
+	{
+		File *file = m_files[filename];
+
+		if (!file)
+			return NULL;
+
+		uint32_t n_addrs = 0;
+		for (LineAddrMap_t::const_iterator it = file->m_lines.begin(); it != file->m_lines.end(); ++it)
+		{
+			n_addrs += it->second.size();
+		}
+
+		// Header + each line + the filename
+		size_t size = sizeof(struct file_data) + file->m_lines.size() * sizeof(struct line_entry)
+				+ n_addrs * sizeof(uint64_t) + file->m_filename.size() + 1 + 8; // allow padding of the address table
+		struct file_data *out = (struct file_data *) xmalloc(size);
+
+		out->magic = to_be<uint32_t>(MERGE_MAGIC);
+		out->version = to_be<uint32_t>(MERGE_VERSION);
+		out->checksum = to_be<uint32_t>(file->m_checksum);
+		out->timestamp = to_be<uint64_t>(file->m_fileTimestamp);
+		out->size = to_be<uint32_t>(size);
+		out->n_entries = to_be<uint32_t>(file->m_lines.size());
+
+		struct line_entry *p = out->entries;
+
+		// Point to address table
+		uint64_t *addrTable = (uint64_t *) ((char *) p + sizeof(struct line_entry) * file->m_lines.size());
+		unsigned long addrTable_8 = (unsigned long) addrTable;
+		uint32_t tableOffset = 0;
+
+		// 64-bit align address table
+		if ((addrTable_8 & 7) != 0)
+		{
+			addrTable_8 += 8 - (addrTable_8 & 7);
+
+			addrTable = (uint64_t *) addrTable_8;
+		}
+
+		for (LineAddrMap_t::const_iterator it = file->m_lines.begin(); it != file->m_lines.end(); ++it)
+		{
+			uint32_t line = it->first;
+			p->line = to_be<uint32_t>(line);
+
+			p->address_start = to_be<uint32_t>(tableOffset);
+			p->n_addresses = to_be<uint32_t>(it->second.size());
+			for (AddrMap_t::const_iterator itAddr = it->second.begin(); itAddr != it->second.end(); ++itAddr)
+			{
+				uint64_t addr = itAddr->first;
+
+				if (file->m_addrHits[addr])
+					addr |= (1ULL << 63);
+
+				addrTable[tableOffset] = to_be<uint64_t>(addr);
+
+				tableOffset++;
+			}
+
+			p++;
+		}
+
+		uint32_t tableStart = (uint32_t) ((char *) addrTable - (char *) out);
+		out->address_table_offset = to_be<uint32_t>(tableStart);
+		char *p_name = (char *) out + tableStart + tableOffset * sizeof(uint64_t);
+
+		// Allocated with the terminator above
+		strcpy(p_name, file->m_filename.c_str());
+		out->file_name_offset = to_be<uint32_t>(p_name - (char *) out);
+
+		return out;
+	}
+
+	bool unMarshalFile(struct file_data *fd)
+	{
+		fd->magic = be_to_host<uint32_t>(fd->magic);
+		fd->version = be_to_host<uint32_t>(fd->version);
+		fd->checksum = be_to_host<uint32_t>(fd->checksum);
+		fd->timestamp = be_to_host<uint64_t>(fd->timestamp);
+		fd->size = be_to_host<uint32_t>(fd->size);
+		fd->n_entries = be_to_host<uint32_t>(fd->n_entries);
+		fd->file_name_offset = be_to_host<uint32_t>(fd->file_name_offset);
+		fd->address_table_offset = be_to_host<uint32_t>(fd->address_table_offset);
+
+		if (fd->magic != MERGE_MAGIC)
+			return false;
+
+		if (fd->version != MERGE_VERSION)
+			return false;
+
+		struct line_entry *p = fd->entries;
+
+		// Unmarshal entries...
+		for (unsigned i = 0; i < fd->n_entries; i++)
+		{
+			p->line = be_to_host<uint32_t>(p->line);
+			p->n_addresses = be_to_host<uint32_t>(p->n_addresses);
+			p->address_start = be_to_host<uint32_t>(p->address_start);
+
+			p++;
+		}
+
+		// ... and the address table
+		uint64_t *addressTable = (uint64_t *) ((char *) fd + fd->address_table_offset);
+		for (unsigned i = 0; i < (fd->file_name_offset - fd->address_table_offset) / sizeof(uint64_t); i++)
+			addressTable[i] = be_to_host<uint64_t>(addressTable[i]);
+
+		return true;
+	}
+
+	typedef std::unordered_map<uint64_t, unsigned int> AddrMap_t;
+	typedef std::unordered_map<unsigned int, AddrMap_t> LineAddrMap_t;
+
+	class File
+	{
+	public:
+		File(const std::string &filename) :
+				m_filename(filename), m_local(false)
+		{
+			void *data;
+			size_t size;
+
+			data = read_file(&size, "%s", filename.c_str());
+			panic_if(!data, "File %s exists, but can't be read???", filename.c_str());
+			m_checksum = hash_block(data, size);
+			m_fileTimestamp = get_file_timestamp(filename.c_str());
+
+			free((void *) data);
+		}
+
+		void setLocal()
+		{
+			m_local = true;
+		}
+
+		void addLine(unsigned int lineNr, uint64_t addr)
+		{
+			m_lines[lineNr][addr]++;
+		}
+
+		void registerHits(uint64_t addr, unsigned int hits)
+		{
+			m_addrHits[addr] += hits;
+		}
+
+		std::string m_filename;
+		uint64_t m_fileTimestamp;
+		LineAddrMap_t m_lines;
+		AddrMap_t m_addrHits;
+		uint32_t m_checksum;
+		bool m_local;
+	};
+
+	typedef std::vector<ICollector::IListener *> CollectorListenerList_t;
+	typedef std::unordered_map<std::string, File *> FileByNameMap_t;
+	typedef std::unordered_map<uint64_t, File *> FileByAddressMap_t;
+	typedef std::unordered_map<uint64_t, uint64_t> FileLineByAddress_t;
+	typedef std::unordered_map<uint64_t, unsigned long> AddrToHitsMap_t;
+	typedef std::unordered_map<uint64_t, unsigned long> AddressByFileLine_t;
+	typedef std::vector<IFileParser::ILineListener *> LineListenerList_t;
+
+	// All files in the current coverage session
+	FileByNameMap_t m_files;
+	FileByAddressMap_t m_filesByAddress;
+	FileLineByAddress_t m_fileLineByAddress;
+	AddrToHitsMap_t m_pendingHits;
+
+	LineListenerList_t m_lineListeners;
+	const std::string m_baseDirectory;
+	const std::string m_outputDirectory;
+
+	CollectorListenerList_t m_collectorListeners;
+	IFilter &m_filter;
+};
+
+namespace kcov
+{
+IMergeParser &createMergeParser(IReporter &reporter, const std::string &baseDirectory, const std::string &outputDirectory,
+		IFilter &filter)
+{
+	return *new MergeParser(reporter, baseDirectory, outputDirectory, filter);
+}
+}
diff --git a/kcov-38/src/merge-parser.hh b/kcov-38/src/merge-parser.hh
new file mode 100644
index 000000000000..8053a578dca4
--- /dev/null
+++ b/kcov-38/src/merge-parser.hh
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <reporter.hh>
+
+#include <string>
+
+namespace kcov
+{
+	class IFileParser;
+
+	class IMergeParser :
+		public IFileParser,
+		public IReporter::IListener,
+		public IWriter,
+		public ICollector
+	{
+	};
+
+	IMergeParser &createMergeParser(IReporter &reporter,
+			const std::string &baseDirectory,
+			const std::string &outputDirectory,
+			IFilter &filter);
+}
diff --git a/kcov-38/src/output-handler.cc b/kcov-38/src/output-handler.cc
new file mode 100644
index 000000000000..3d51674feed5
--- /dev/null
+++ b/kcov-38/src/output-handler.cc
@@ -0,0 +1,150 @@
+#include <output-handler.hh>
+#include <writer.hh>
+#include <configuration.hh>
+#include <reporter.hh>
+#include <collector.hh>
+#include <file-parser.hh>
+#include <utils.hh>
+
+#include <list>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+#include <dirent.h>
+
+namespace kcov
+{
+	class OutputHandler :
+			public IOutputHandler,
+			public ICollector::IEventTickListener
+	{
+	public:
+		OutputHandler(IReporter &reporter, ICollector *collector)
+		{
+			IConfiguration &conf = IConfiguration::getInstance();
+
+			m_baseDirectory = conf.keyAsString("out-directory");
+			m_outDirectory = conf.keyAsString("target-directory") + "/";
+			m_summaryDbFileName = m_outDirectory + "/summary.db";
+			m_outputInterval = conf.keyAsInt("output-interval");
+
+			m_lastTimestamp = get_ms_timestamp();
+
+			std::string readableName = fmt("%s/%s", m_baseDirectory.c_str(),  conf.keyAsString("binary-name").c_str());
+
+			(void)mkdir(m_baseDirectory.c_str(), 0755);
+			(void)mkdir(m_outDirectory.c_str(), 0755);
+
+			(void)unlink(readableName.c_str());
+			if (symlink(m_outDirectory.c_str(), readableName.c_str()) < 0)
+			{
+				kcov_debug(INFO_MSG, "Can't symlink readable name\n");
+			}
+
+			if (collector)
+				collector->registerEventTickListener(*this);
+		}
+
+		~OutputHandler()
+		{
+			stop();
+
+			// Delete all writers
+			for (WriterList_t::iterator it = m_writers.begin();
+					it != m_writers.end();
+					++it)
+			{
+				IWriter *cur = *it;
+
+				delete cur;
+			}
+		}
+
+		const std::string &getBaseDirectory()
+		{
+			return m_baseDirectory;
+		}
+
+
+		const std::string &getOutDirectory()
+		{
+			return m_outDirectory;
+		}
+
+		void registerWriter(IWriter &writer)
+		{
+			m_writers.push_back(&writer);
+		}
+
+		void start()
+		{
+			for (WriterList_t::const_iterator it = m_writers.begin();
+					it != m_writers.end();
+					++it)
+				(*it)->onStartup();
+		}
+
+		void stop()
+		{
+			for (WriterList_t::const_iterator it = m_writers.begin();
+					it != m_writers.end();
+					++it)
+				(*it)->onStop();
+
+			// Produce output after stop if anyone yields new data in onStop()
+			produce();
+		}
+
+		void produce()
+		{
+			for (WriterList_t::const_iterator it = m_writers.begin();
+					it != m_writers.end();
+					++it)
+				(*it)->write();
+		}
+
+		// From ICollector::IEventTickListener
+		void onTick()
+		{
+			if (m_outputInterval == 0)
+				return;
+
+			if (get_ms_timestamp() - m_lastTimestamp >= m_outputInterval)
+			{
+				produce();
+
+				// Take a new timestamp since producing might take a long time
+				m_lastTimestamp = get_ms_timestamp();
+			}
+		}
+
+
+	private:
+		typedef std::vector<IWriter *> WriterList_t;
+
+		std::string m_outDirectory;
+		std::string m_baseDirectory;
+		std::string m_summaryDbFileName;
+
+		WriterList_t m_writers;
+
+		unsigned int m_outputInterval;
+		uint64_t m_lastTimestamp;
+	};
+
+	static OutputHandler *instance;
+	IOutputHandler &IOutputHandler::create(IReporter &reporter, ICollector *collector)
+	{
+		if (!instance)
+			instance = new OutputHandler(reporter, collector);
+
+		return *instance;
+	}
+
+	IOutputHandler &IOutputHandler::getInstance()
+	{
+		return *instance;
+	}
+}
diff --git a/kcov-38/src/parser-manager.cc b/kcov-38/src/parser-manager.cc
new file mode 100644
index 000000000000..77e77cf435ec
--- /dev/null
+++ b/kcov-38/src/parser-manager.cc
@@ -0,0 +1,63 @@
+#include <file-parser.hh>
+#include <utils.hh>
+
+#include <vector>
+
+using namespace kcov;
+
+class ParserManager: public IParserManager
+{
+public:
+	ParserManager()
+	{
+	}
+
+	void registerParser(IFileParser &parser)
+	{
+		m_parsers.push_back(&parser);
+	}
+
+	IFileParser *matchParser(const std::string &fileName)
+	{
+		IFileParser *best = NULL;
+		size_t sz;
+
+		uint8_t *data = (uint8_t *) peek_file(&sz, "%s", fileName.c_str());
+
+		if (!data)
+			return NULL;
+
+		for (ParserList_t::const_iterator it = m_parsers.begin(); it != m_parsers.end(); ++it)
+		{
+			unsigned int myVal = (*it)->matchParser(fileName, data, sz);
+			if (myVal == match_none)
+				continue;
+
+			if (!best)
+				best = *it;
+
+			unsigned int bestVal = best->matchParser(fileName, data, sz);
+
+			if (myVal > bestVal)
+				best = *it;
+		}
+
+		free((void *) data);
+
+		return best;
+	}
+
+private:
+	typedef std::vector<IFileParser *> ParserList_t;
+
+	ParserList_t m_parsers;
+};
+
+static ParserManager *g_instance;
+IParserManager &IParserManager::getInstance()
+{
+	if (!g_instance)
+		g_instance = new ParserManager();
+
+	return *g_instance;
+}
diff --git a/kcov-38/src/parsers/bfd-disassembler.cc b/kcov-38/src/parsers/bfd-disassembler.cc
new file mode 100644
index 000000000000..43653ee07c94
--- /dev/null
+++ b/kcov-38/src/parsers/bfd-disassembler.cc
@@ -0,0 +1,439 @@
+#include <disassembler.hh>
+#include <utils.hh>
+
+#include <unordered_map>
+#include <set>
+#include <map>
+#include <algorithm>
+
+#ifndef ATTRIBUTE_FPTR_PRINTF_2
+# define ATTRIBUTE_FPTR_PRINTF_2
+#endif
+
+#include <bfd.h>
+#include <dis-asm.h>
+
+#include <elf.h>
+
+using namespace kcov;
+
+const uint64_t BT_INVALID = 0xfffffffffffffffeull;
+
+const std::set<std::string> x86BranchInstructions =
+{
+		"ja",
+		"jae",
+		"jbe",
+		"jc",
+		"je",
+		"jg",
+		"jge",
+		"jl",
+		"jle",
+		"jna",
+		"jnae",
+		"jnb",
+		"jnbe",
+		"jnc",
+		"jne",
+		"jng",
+		"jnge",
+		"jnl",
+		"jnle",
+		"jno",
+		"jnp",
+		"jns",
+		"jnz",
+		"jo",
+		"jp",
+		"jpe",
+		"jpo",
+		"js",
+		"jz",
+		"jczx"
+		"jezx"
+
+		"loop",
+
+		"jmp",
+
+		"call",
+
+		"ret",
+};
+
+/*
+ * Since binutils >= 2.29 or so, print_insn_i386 is no longer defined in
+ * dis-asm.h. I'm not sure what the correct and backwards compatible way
+ * of handling this is, so define it here.
+ */
+extern "C" int print_insn_i386              (bfd_vma, disassemble_info *);
+
+class BfdDisassembler : public IDisassembler
+{
+public:
+	BfdDisassembler()
+	{
+		memset(&m_info, 0, sizeof(m_info));
+		init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic);
+		m_disassembler = print_insn_i386;
+
+		m_info.arch = bfd_arch_i386;
+
+		disassemble_init_for_target(&m_info);
+		m_info.application_data = (void *)this;
+	}
+
+	virtual void setup(const void *header, size_t headerSize)
+	{
+		const uint8_t *data = (const uint8_t *)header;
+
+		panic_if(headerSize <= EI_CLASS,
+				"Header size must be at least %u", EI_CLASS);
+
+		if (data[EI_CLASS] == ELFCLASS64)
+			m_info.mach = bfd_mach_x86_64;
+		else
+			m_info.mach = bfd_mach_i386_i386;
+	}
+
+	void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress)
+	{
+		SectionCache_t::iterator it = m_cache.find(baseAddress);
+
+		// Not visited before
+		if (it == m_cache.end())
+			m_cache[baseAddress] = new Section(sectionData, sectionSize, baseAddress);
+	}
+
+	bool verify(uint64_t address)
+	{
+		Section *p = lookupSection(address);
+
+		if (!p)
+			return true;
+
+		if (!p->isDisassembled())
+			p->disassemble(*this, m_info, m_disassembler);
+
+		// The address is valid there is an instruction starting at it
+		return getInstruction(address) != NULL;
+	}
+
+	const std::vector<uint64_t> &getBasicBlock(uint64_t address)
+	{
+		if (m_bbs.empty())
+			setupBasicBlocks();
+
+		if (m_instructions.find(address) == m_instructions.end())
+			return m_empty;
+
+		return m_instructions[address].getBasicBlock()->getInstructionAddresses();
+	}
+
+private:
+	class BasicBlock
+	{
+	public:
+		BasicBlock()
+		{
+		}
+
+		const std::vector<uint64_t> &getInstructionAddresses() const
+		{
+			return m_instructionAddresses;
+		}
+
+		void addInstructionAddress(uint64_t address)
+		{
+			m_instructionAddresses.push_back(address);
+		}
+
+	private:
+		std::vector<uint64_t> m_instructionAddresses;
+	};
+
+	class Instruction
+	{
+	public:
+		Instruction(uint64_t branchTarget = 0) :
+			m_branchTarget(branchTarget),
+			m_leader(false),
+			m_bb(NULL)
+		{
+		}
+
+		uint64_t getBranchTarget() const
+		{
+			return m_branchTarget;
+		}
+
+		bool isBranch() const
+		{
+			return m_branchTarget != BT_INVALID;
+		}
+
+		bool isLeader() const
+		{
+			return m_leader;
+		}
+
+		void makeLeader()
+		{
+			m_leader = true;
+		}
+
+		const BasicBlock *getBasicBlock() const
+		{
+			return m_bb;
+		}
+
+		void setBasicBlock(const BasicBlock *bb)
+		{
+			m_bb = bb;
+		}
+
+	private:
+		uint64_t m_branchTarget;
+		bool m_leader;
+		const BasicBlock *m_bb;
+	};
+
+	class Section
+	{
+	public:
+		Section(const void *data, size_t size, uint64_t startAddress) :
+			m_size(size),
+			m_startAddress(startAddress),
+			m_disassembled(false)
+		{
+			m_data = xmalloc(size);
+			memcpy(m_data, data, size);
+		}
+
+		uint64_t getBase() const
+		{
+			return m_startAddress;
+		}
+
+		size_t getSize() const
+		{
+			return m_size;
+		}
+
+		bool isDisassembled() const
+		{
+			return m_disassembled;
+		}
+
+		void disassemble(BfdDisassembler &target, struct disassemble_info info, disassembler_ftype disassembler)
+		{
+			if (m_disassembled)
+					return;
+
+			m_disassembled = true;
+
+			info.buffer_vma = 0;
+			info.buffer_length = m_size;
+			info.buffer = (bfd_byte *)m_data;
+			info.stream = (void *)&target;
+
+			uint64_t pc = 0;
+			int count;
+			do
+			{
+				target.m_instructionVector.clear();
+				count = disassembler(pc, &info);
+
+				if (count < 0)
+					break;
+
+				target.m_instructions[pc + m_startAddress] = target.instructionFactory(pc, target.m_instructionVector);
+				// Point back into the other map
+				target.m_orderedInstructions[pc + m_startAddress] = &target.m_instructions[pc + m_startAddress];
+
+				pc += count;
+			} while (count > 0 && pc < m_size);
+		}
+
+	private:
+		void *m_data;
+		const size_t m_size;
+		const uint64_t m_startAddress;
+
+		bool m_disassembled; // Lazy disassembly once it's used
+	};
+
+	// Implementation taken from EmilPRO, https://github.com/SimonKagstrom/emilpro
+	Instruction instructionFactory(uint64_t pc, const std::vector<std::string> &vec)
+	{
+		uint64_t branchTarget = BT_INVALID; // Invalid
+
+		// No encoding???
+		if (vec.size() < 1)
+			return Instruction();
+
+		std::set<std::string>::const_iterator it = x86BranchInstructions.find(vec[0]);
+
+		// Address?
+		if (it != x86BranchInstructions.end() &&
+				vec.size() >= 2 && string_is_integer(vec[1]))
+		{
+			int64_t offset = string_to_integer(vec[1]);
+
+			// FIXME! Check if this is correct
+			if ( (offset & (1 << 31)) )
+				offset |= 0xffffffff00000000ULL;
+
+			branchTarget = pc + offset;
+		}
+
+		return Instruction(branchTarget);
+	}
+
+	Section *lookupSection(uint64_t address)
+	{
+		SectionCache_t::iterator it = m_cache.lower_bound(address);
+
+		if (it == m_cache.end())
+			return NULL;
+		--it;
+
+		// Above the last symbol
+		if (it == m_cache.end())
+			return NULL;
+
+		Section *cur = it->second;
+		uint64_t end = cur->getBase() + cur->getSize() - 1;
+
+		// Below nearest (possible?)
+		if (address < cur->getBase())
+			return NULL;
+
+		// Above section
+		if (address > end)
+			return NULL;
+
+		// Just right!
+		return cur;
+	}
+
+	void setupBasicBlocks()
+	{
+		for (SectionCache_t::iterator it = m_cache.begin();
+				it != m_cache.end();
+				++it)
+			it->second->disassemble(*this, m_info, m_disassembler);
+
+		InstructionOrderedMap_t::iterator cur = m_orderedInstructions.begin();
+
+		// The no-instructions program. Uncommon.
+		if (cur == m_orderedInstructions.end())
+			return;
+
+		InstructionOrderedMap_t::iterator next = cur;
+		next++;
+
+		// The first instruction is always a leader
+		cur->second->makeLeader();
+
+		// The one-instructions program. Also uncommon.
+		if (next == m_orderedInstructions.end())
+			return;
+
+		// Iterate the instruction pairs
+		for (; next != m_orderedInstructions.end(); ++cur, ++next)
+		{
+			// Mark branch targets as leaders, as well as the instruction after that
+			if (cur->second->isBranch())
+			{
+				m_instructions[cur->second->getBranchTarget()].makeLeader();
+				next->second->makeLeader();
+			}
+		}
+
+		// Create and populate basic blocks
+		BasicBlock *bb = NULL;
+
+		m_bbs.push_back(bb);
+		for (InstructionOrderedMap_t::iterator it = m_orderedInstructions.begin();
+				it != m_orderedInstructions.end();
+				++it)
+		{
+			Instruction *cur = it->second;
+
+			if (cur->isLeader())
+			{
+				bb = new BasicBlock();
+				m_bbs.push_back(bb);
+			}
+
+			cur->setBasicBlock(bb);
+			bb->addInstructionAddress(it->first);
+		}
+	}
+
+
+	Instruction *getInstruction(uint64_t address)
+	{
+		if (m_instructions.find(address) == m_instructions.end())
+			return NULL;
+
+		return &m_instructions[address];
+	}
+
+
+
+	void opcodesFprintFunc(const char *str)
+	{
+		std::string stdStr(str);
+
+		m_instructionVector.push_back(trim_string(stdStr));
+	}
+
+	static int opcodesFprintFuncStatic(void *info, const char *fmt, ...)
+	{
+		BfdDisassembler *pThis = (BfdDisassembler *)info;
+		char str[64];
+		int out;
+
+		va_list args;
+		va_start (args, fmt);
+		out = vsnprintf( str, sizeof(str) - 1, fmt, args );
+		va_end (args);
+
+		pThis->opcodesFprintFunc(str);
+
+		return out;
+	}
+
+	typedef std::map<uint64_t, Section *> SectionCache_t;
+	typedef std::unordered_map<uint64_t, Instruction> InstructionAddressMap_t;
+	typedef std::map<uint64_t, Instruction *> InstructionOrderedMap_t;
+
+	struct disassemble_info m_info;
+	disassembler_ftype m_disassembler;
+
+
+	std::vector<std::string> m_instructionVector;
+
+	SectionCache_t m_cache;
+	InstructionAddressMap_t m_instructions;
+	InstructionOrderedMap_t m_orderedInstructions;
+
+	std::vector<BasicBlock *> m_bbs;
+	std::vector<uint64_t> m_empty;
+};
+
+IDisassembler &IDisassembler::getInstance()
+{
+	static BfdDisassembler *g_p;
+
+	if (!g_p)
+	{
+		bfd_init();
+		g_p = new BfdDisassembler();
+	}
+
+	return *g_p;
+}
diff --git a/kcov-38/src/parsers/dummy-disassembler.cc b/kcov-38/src/parsers/dummy-disassembler.cc
new file mode 100644
index 000000000000..2c8523b45a0c
--- /dev/null
+++ b/kcov-38/src/parsers/dummy-disassembler.cc
@@ -0,0 +1,49 @@
+#include <disassembler.hh>
+
+using namespace kcov;
+
+class DummyDisassembler : public IDisassembler
+{
+public:
+	virtual void setup(const void *header, size_t headerSize)
+	{
+	}
+
+	void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress)
+	{
+	}
+
+	const std::vector<uint64_t> &getBasicBlock(uint64_t address)
+	{
+		return m_empty;
+	}
+
+	bool verify(uint64_t offset)
+	{
+		/*
+		 * ARM and PowerPC have fixed-length instructions, so this is actually
+		 * a valid way of validating.
+		 *
+		 * Of course, it would be better if we knew if thumb mode was used.
+		 */
+#if defined(__arm__)
+		return (offset & 1) == 0; // Thumb-conservative
+#elif defined(__powerpc__)
+		return (offset & 3) == 0;
+#endif
+
+		return true;
+	}
+
+	std::vector<uint64_t> m_empty;
+};
+
+IDisassembler &IDisassembler::getInstance()
+{
+	static DummyDisassembler *g_p;
+
+	if (!g_p)
+		g_p = new DummyDisassembler();
+
+	return *g_p;
+}
diff --git a/kcov-38/src/parsers/dwarf-libdwarf.cc b/kcov-38/src/parsers/dwarf-libdwarf.cc
new file mode 100644
index 000000000000..56eaefb427bc
--- /dev/null
+++ b/kcov-38/src/parsers/dwarf-libdwarf.cc
@@ -0,0 +1,152 @@
+#include "dwarf.hh"
+
+#include <utils.hh>
+
+#include <dwarf.h>
+#include <libdwarf/libdwarf.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+
+using namespace kcov;
+
+static void dwarf_error_handler(Dwarf_Error error, Dwarf_Ptr userData)
+{
+	char *msg = dwarf_errmsg(error);
+
+	printf("Dwarf: %s\n", msg);
+}
+
+class DwarfParser::Impl
+{
+public:
+	Impl() :
+	m_fd(-1),
+	m_dwarf(NULL)
+	{
+	}
+
+	int m_fd;
+	Dwarf_Debug m_dwarf;
+};
+
+DwarfParser::DwarfParser()
+{
+	m_impl = new DwarfParser::Impl();
+}
+
+DwarfParser::~DwarfParser()
+{
+	close();
+	delete m_impl;
+}
+
+void DwarfParser::forEachLine(IFileParser::ILineListener& listener)
+{
+	Dwarf_Unsigned header;
+
+	/* Iterate over the headers */
+	while (dwarf_next_cu_header(m_impl->m_dwarf, 0, 0, 0, 0, &header, 0) == DW_DLV_OK)
+	{
+		Dwarf_Line* line_buffer;
+		Dwarf_Signed line_count;
+		Dwarf_Die die;
+		int i;
+
+		if (dwarf_siblingof(m_impl->m_dwarf, 0, &die, 0) != DW_DLV_OK)
+			continue;
+
+		/* Get the source lines */
+		if (dwarf_srclines(die, &line_buffer, &line_count, 0) != DW_DLV_OK)
+			continue;
+
+		/* Store them */
+		for (i = 0; i < line_count; i++)
+		{
+			Dwarf_Unsigned line_nr;
+			char* line_source;
+			Dwarf_Bool is_code;
+			Dwarf_Addr addr;
+
+
+			if (dwarf_lineno(line_buffer[i], &line_nr, 0) != DW_DLV_OK)
+				continue;
+			if (dwarf_linesrc(line_buffer[i], &line_source, 0) != DW_DLV_OK)
+				continue;
+			if (dwarf_linebeginstatement(line_buffer[i], &is_code, 0) != DW_DLV_OK)
+				continue;
+
+			if (dwarf_lineaddr(line_buffer[i], &addr, 0) != DW_DLV_OK)
+				continue;
+
+			if (line_nr && is_code)
+			{
+				static char *srcDirs[1] = {NULL};
+				listener.onLine(fullPath(srcDirs, line_source), line_nr, addr);
+			}
+
+			dwarf_dealloc(m_impl->m_dwarf, line_source, DW_DLA_STRING);
+		}
+	}
+}
+
+void DwarfParser::forAddress(IFileParser::ILineListener& listener, uint64_t address)
+{
+	panic("NYI");
+}
+
+
+std::string DwarfParser::fullPath(const char *const *srcDirs, const std::string &filename)
+{
+	/* Use the full compilation path unless the source already
+	 * has an absolute path */
+	std::string fullFilePath;
+	std::string filePath = filename;
+
+	std::string dir = srcDirs[0] == NULL ? "" : srcDirs[0];
+	fullFilePath = dir_concat(dir, filename);
+	if (filename[0] != '/')
+		filePath = fullFilePath;
+
+	return filePath;
+}
+
+
+
+bool DwarfParser::open(const std::string& filename)
+{
+	close();
+
+	m_impl->m_fd = ::open(filename.c_str(), O_RDONLY);
+
+	if (m_impl->m_fd < 0)
+		return false;
+
+	/* Initialize libdwarf */
+	int err = dwarf_init(m_impl->m_fd, DW_DLC_READ, dwarf_error_handler, 0, &m_impl->m_dwarf,0);
+	if (err == DW_DLV_ERROR)
+	{
+		::close(m_impl->m_fd);
+		m_impl->m_fd = -1;
+
+		return false;
+	}
+
+	return true;
+}
+
+void DwarfParser::close()
+{
+	if (m_impl->m_fd < 0)
+		return;
+
+	dwarf_finish(m_impl->m_dwarf, 0);
+
+	::close(m_impl->m_fd);
+
+	m_impl->m_fd = -1;
+	m_impl->m_dwarf = NULL;
+}
diff --git a/kcov-38/src/parsers/dwarf.cc b/kcov-38/src/parsers/dwarf.cc
new file mode 100644
index 000000000000..3578096d96ec
--- /dev/null
+++ b/kcov-38/src/parsers/dwarf.cc
@@ -0,0 +1,229 @@
+#include "dwarf.hh"
+
+#include <utils.hh>
+
+#include <elfutils/libdw.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+
+using namespace kcov;
+
+class DwarfParser::Impl
+{
+public:
+	Impl() :
+	m_fd(-1),
+	m_dwarf(NULL)
+	{
+	}
+
+	int m_fd;
+	Dwarf *m_dwarf;
+};
+
+DwarfParser::DwarfParser()
+{
+	m_impl = new DwarfParser::Impl();
+}
+
+DwarfParser::~DwarfParser()
+{
+	close();
+	delete m_impl;
+}
+
+void DwarfParser::forEachLine(IFileParser::ILineListener& listener)
+{
+	if (!m_impl->m_dwarf)
+		return;
+
+	Dwarf_Off offset = 0;
+	Dwarf_Off lastOffset = 0;
+	size_t headerSize;
+
+	/* Iterate over the headers */
+	while (dwarf_nextcu(m_impl->m_dwarf, offset, &offset, &headerSize, 0, 0, 0) == 0)
+	{
+		Dwarf_Lines* lines;
+		Dwarf_Files *files;
+		size_t lineCount;
+		size_t fileCount;
+		Dwarf_Die die;
+		unsigned int i;
+
+		if (dwarf_offdie(m_impl->m_dwarf, lastOffset + headerSize, &die) == NULL)
+			continue;
+
+		lastOffset = offset;
+
+		/* Get the source lines */
+		if (dwarf_getsrclines(&die, &lines, &lineCount) != 0)
+			continue;
+
+		/* And the files */
+		if (dwarf_getsrcfiles(&die, &files, &fileCount) != 0)
+			continue;
+
+		const char *const *srcDirs;
+		size_t ndirs = 0;
+
+		/* Lookup the compilation path */
+		if (dwarf_getsrcdirs(files, &srcDirs, &ndirs) != 0)
+			continue;
+
+		if (ndirs == 0)
+			continue;
+
+		/* Iterate through the source lines */
+		for (i = 0; i < lineCount; i++)
+		{
+			Dwarf_Line *line;
+			int lineNr = 0;
+			const char* lineSource;
+			Dwarf_Word mtime, len;
+			bool isCode;
+			Dwarf_Addr addr;
+
+			if ( !(line = dwarf_onesrcline(lines, i)) )
+				continue;
+
+			if (dwarf_lineno(line, &lineNr) != 0)
+				continue;
+
+			if (!(lineSource = dwarf_linesrc(line, &mtime, &len)) )
+				continue;
+
+			if (dwarf_linebeginstatement(line, &isCode) != 0)
+				continue;
+
+			if (dwarf_lineaddr(line, &addr) != 0)
+				continue;
+
+			// Invalid line number?
+			if (lineNr == 0)
+				continue;
+
+			// Non-code?
+			if (!isCode)
+				continue;
+
+			listener.onLine(fullPath(srcDirs, lineSource), lineNr, addr);
+		}
+	}
+}
+
+void DwarfParser::forAddress(IFileParser::ILineListener& listener, uint64_t address)
+{
+	if (!m_impl->m_dwarf)
+		return;
+
+	Dwarf_Off offset = 0;
+	Dwarf_Off lastOffset = 0;
+	size_t headerSize;
+
+	if (!m_impl->m_dwarf)
+		return;
+
+	/* Iterate over the headers */
+	while (dwarf_nextcu(m_impl->m_dwarf, offset, &offset, &headerSize, 0, 0, 0) == 0)
+	{
+		Dwarf_Die die;
+
+		if (dwarf_offdie(m_impl->m_dwarf, lastOffset + headerSize, &die) == NULL)
+		{
+			lastOffset = offset;
+			continue;
+		}
+
+		lastOffset = offset;
+
+		Dwarf_Line *line;
+		Dwarf_Files *files;
+		size_t fileCount;
+
+		line = dwarf_getsrc_die(&die, address);
+		if (!line)
+			continue;
+
+		/* And the files */
+		if (dwarf_getsrcfiles(&die, &files, &fileCount) != 0)
+			continue;
+
+		const char* lineSource;
+		Dwarf_Word mtime, len;
+
+		if (!(lineSource = dwarf_linesrc(line, &mtime, &len)) )
+			return;
+
+		const char *const *srcDirs;
+		size_t ndirs = 0;
+
+		/* Lookup the compilation path */
+		if (dwarf_getsrcdirs(files, &srcDirs, &ndirs) != 0)
+			continue;
+
+		int lineNr;
+
+		if (dwarf_lineno(line, &lineNr) != 0)
+			continue;
+
+		listener.onLine(fullPath(srcDirs, lineSource), lineNr, address);
+	}
+}
+
+
+std::string DwarfParser::fullPath(const char *const *srcDirs, const std::string &filename)
+{
+	/* Use the full compilation path unless the source already
+	 * has an absolute path */
+	std::string fullFilePath;
+	std::string filePath = filename;
+
+	std::string dir = srcDirs[0] == NULL ? "" : srcDirs[0];
+	fullFilePath = dir_concat(dir, filename);
+	if (filename[0] != '/')
+		filePath = fullFilePath;
+
+	return filePath;
+}
+
+
+
+bool DwarfParser::open(const std::string& filename)
+{
+	close();
+
+	m_impl->m_fd = ::open(filename.c_str(), O_RDONLY);
+
+	if (m_impl->m_fd < 0)
+		return false;
+
+	/* Initialize libdwarf from the file descriptor */
+	m_impl->m_dwarf = dwarf_begin(m_impl->m_fd, DWARF_C_READ);
+
+	if (!m_impl->m_dwarf)
+	{
+		::close(m_impl->m_fd);
+		m_impl->m_fd = -1;
+
+		return false;
+	}
+
+	return true;
+}
+
+void DwarfParser::close()
+{
+	if (m_impl->m_dwarf)
+		dwarf_end(m_impl->m_dwarf);
+
+	if (m_impl->m_fd >= 0)
+		::close(m_impl->m_fd);
+
+	m_impl->m_fd = -1;
+	m_impl->m_dwarf = NULL;
+}
diff --git a/kcov-38/src/parsers/dwarf.hh b/kcov-38/src/parsers/dwarf.hh
new file mode 100644
index 000000000000..98ea5a4f49fe
--- /dev/null
+++ b/kcov-38/src/parsers/dwarf.hh
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <file-parser.hh>
+
+namespace kcov
+{
+	class DwarfParser
+	{
+	public:
+		DwarfParser();
+
+		~DwarfParser();
+
+		bool open(const std::string &filename);
+
+		void forEachLine(IFileParser::ILineListener &listener);
+
+		void forAddress(IFileParser::ILineListener &listener, uint64_t address);
+
+	private:
+		class Impl;
+
+		std::string fullPath(const char *const *srcDirs, const std::string &filename);
+
+		void close();
+
+		Impl *m_impl;
+	};
+}
diff --git a/kcov-38/src/parsers/elf-parser.cc b/kcov-38/src/parsers/elf-parser.cc
new file mode 100644
index 000000000000..283d5570f554
--- /dev/null
+++ b/kcov-38/src/parsers/elf-parser.cc
@@ -0,0 +1,585 @@
+#include <file-parser.hh>
+#include <engine.hh>
+#include <utils.hh>
+#include <capabilities.hh>
+#include <gcov.hh>
+#include <phdr_data.h>
+#include <disassembler.hh>
+#include <elf.hh>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <libelf.h>
+#include <dwarf.h>
+#include <elfutils/libdw.h>
+#include <map>
+#include <vector>
+#include <string>
+#include <configuration.hh>
+
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include <link.h>
+
+#include <filter.hh>
+#include <libgen.h>
+
+#include "dwarf.hh"
+
+using namespace kcov;
+
+enum SymbolType
+{
+	SYM_NORMAL = 0, SYM_DYNAMIC = 1,
+};
+typedef std::vector<Segment> SegmentList_t;
+
+class ElfInstance : public IFileParser, IFileParser::ILineListener
+{
+public:
+	ElfInstance() : m_addressVerifier(IDisassembler::getInstance())
+	{
+		m_elf = NULL;
+		m_filename = "";
+		m_checksum = 0;
+		m_elfIs32Bit = true;
+		m_elfIsShared = false;
+		m_isMainFile = true;
+		m_initialized = false;
+		m_filter = NULL;
+		m_verifyAddresses = false;
+		m_debuglinkCrc = 0;
+		m_relocation = 0;
+		m_invalidBreakpoints = 0;
+
+		IParserManager::getInstance().registerParser(*this);
+	}
+
+	virtual ~ElfInstance()
+	{
+	}
+
+	uint64_t getChecksum()
+	{
+		return m_checksum;
+	}
+
+	std::string getParserType()
+	{
+		return "ELF";
+	}
+
+	bool elfIs64Bit()
+	{
+		return !m_elfIs32Bit;
+	}
+
+	void setupParser(IFilter *filter)
+	{
+		m_filter = filter;
+	}
+
+	enum IFileParser::PossibleHits maxPossibleHits()
+	{
+		return IFileParser::HITS_LIMITED; // Breakpoints are cleared after a hit
+	}
+
+	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		Elf32_Ehdr *hdr = (Elf32_Ehdr *) data;
+
+		if (memcmp(hdr->e_ident, ELFMAG, strlen(ELFMAG)) == 0)
+			return match_perfect;
+
+		return match_none;
+	}
+
+	bool addFile(const std::string &filename, struct phdr_data_entry *data)
+	{
+		if (!m_initialized)
+		{
+			m_verifyAddresses = IConfiguration::getInstance().keyAsInt("verify");
+
+			panic_if(elf_version(EV_CURRENT) == EV_NONE, "ELF version failed\n");
+			m_initialized = true;
+		}
+
+		m_filename = filename;
+
+		m_buildId.clear();
+		m_debuglink.clear();
+
+		m_curSegments.clear();
+		m_executableSegments.clear();
+		for (uint32_t i = 0; data && i < data->n_segments; i++)
+		{
+			struct phdr_data_segment *seg = &data->segments[i];
+
+			m_curSegments.push_back(Segment(NULL, seg->paddr, seg->vaddr, seg->size));
+		}
+
+		if (!checkFile())
+			return false;
+
+		for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
+			(*it)->onFile(File(m_filename, m_isMainFile ? IFileParser::FLG_NONE : IFileParser::FLG_TYPE_SOLIB));
+
+		return true;
+	}
+
+	bool checkFile()
+	{
+		struct Elf *elf;
+		bool out = true;
+		int fd;
+
+		fd = ::open(m_filename.c_str(), O_RDONLY, 0);
+		if (fd < 0)
+		{
+			kcov_debug(ELF_MSG, "Cannot open %s\n", m_filename.c_str());
+			return false;
+		}
+
+		if (!(elf = elf_begin(fd, ELF_C_READ, NULL)))
+		{
+			error("elf_begin failed on %s\n", m_filename.c_str());
+			out = false;
+			goto out_open;
+		}
+		if (elf_kind(elf) == ELF_K_NONE)
+			out = false;
+
+		if (m_isMainFile)
+		{
+			char *raw;
+			size_t sz;
+			uint16_t e_type;
+
+			raw = elf_getident(elf, &sz);
+
+			if (raw && sz > EI_CLASS)
+			{
+				ICapabilities &capabilities = ICapabilities::getInstance();
+
+				m_elfIs32Bit = raw[EI_CLASS] == ELFCLASS32;
+
+				if (elfIs64Bit() != machine_is_64bit())
+					capabilities.removeCapability("handle-solibs");
+				else
+					capabilities.addCapability("handle-solibs");
+			}
+
+			e_type = m_elfIs32Bit ? elf32_getehdr(elf)->e_type : elf64_getehdr(elf)->e_type;
+
+			m_elfIsShared = e_type == ET_DYN;
+			if (!m_checksum)
+			{
+				m_checksum = m_elfIs32Bit ? elf32_checksum(elf) : elf64_checksum(elf);
+			}
+		}
+
+		elf_end(elf);
+
+		out_open: close(fd);
+
+		return out;
+	}
+
+	bool parse()
+	{
+		bool out = true;
+
+		// should defer until setMainFileRelocation
+		if (m_isMainFile && m_elfIsShared)
+		{
+
+			// ... but this needs to be done if we don't have solibs
+			if (!IConfiguration::getInstance().keyAsInt("parse-solibs"))
+				setMainFileRelocation(0);
+		}
+		else
+		{
+			out = doParse(0);
+		}
+
+		m_isMainFile = false;
+
+		return out;
+	}
+
+	bool doParse(unsigned long relocation)
+	{
+		struct stat st;
+
+		if (lstat(m_filename.c_str(), &st) < 0)
+			return false;
+
+		parseOneElf();
+
+		setupSections();
+
+		// Gcov data?
+		if (IConfiguration::getInstance().keyAsInt("gcov") && !m_gcnoFiles.empty())
+			parseGcnoFiles(relocation);
+		else
+			parseOneDwarf(relocation);
+
+		return true;
+	}
+
+	bool setMainFileRelocation(unsigned long relocation)
+	{
+		kcov_debug(INFO_MSG, "main file relocation = %#lx\n", relocation);
+
+		if (m_elfIsShared)
+		{
+			if (!doParse(relocation))
+				return false;
+		}
+		else
+		{
+			// this situation is probably problematic, as we have already notified
+			// segment informations to the listeners.
+			if (relocation != 0)
+			{
+				warning("Got a static executable with relocation=%#lx, "
+						"probably the trace wouldn't work.", relocation);
+			}
+		}
+
+		return true;
+	}
+
+	void parseGcnoFiles(unsigned long relocation)
+	{
+		for (FileList_t::const_iterator it = m_gcnoFiles.begin(); it != m_gcnoFiles.end(); ++it)
+		{
+			const std::string &cur = *it;
+
+			parseOneGcno(cur, relocation);
+		}
+	}
+
+	void parseOneGcno(const std::string &filename, unsigned long relocation)
+	{
+		size_t sz;
+		void *data;
+
+		// The data is freed by the parser
+		data = read_file(&sz, "%s", filename.c_str());
+		if (!data)
+			return;
+
+		// Parse this gcno file!
+		GcnoParser parser((uint8_t *) data, sz);
+
+		// Parsing error?
+		if (!parser.parse())
+		{
+			warning("Can't parse %s\n", filename.c_str());
+
+			return;
+		}
+
+		const GcnoParser::BasicBlockList_t &bbs = parser.getBasicBlocks();
+
+		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
+		{
+			const GcnoParser::BasicBlockMapping &cur = *it;
+
+			// Report a generated address
+			for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
+				(*it)->onLine(cur.m_file, cur.m_line,
+						gcovGetAddress(cur.m_file, cur.m_function, cur.m_basicBlock, cur.m_index) + relocation);
+		}
+	}
+
+	void setupSections()
+	{
+		for (SegmentList_t::const_iterator it = m_executableSegments.begin(); it != m_executableSegments.end(); ++it)
+		{
+			m_addressVerifier.addSection(it->getData(), it->getSize(), it->getBase());
+		}
+	}
+
+	bool parseOneDwarf(unsigned long relocation)
+	{
+		m_invalidBreakpoints = 0;
+		m_relocation = relocation;
+
+		DwarfParser dp;
+
+		bool rv = dp.open(m_filename);
+
+		if (!rv && m_buildId.length() > 0)
+		{
+			/* Look for separate debug info: build-ids */
+			std::string debug_file = std::string(
+					"/usr/lib/debug/.build-id/" + m_buildId.substr(0, 2) + "/" + m_buildId.substr(2, std::string::npos)
+							+ ".debug");
+
+			rv = dp.open(debug_file);
+			if (!rv && m_isMainFile)
+				kcov_debug(ELF_MSG, "Cannot open %s\n", debug_file.c_str());
+		}
+
+		if (!rv && m_debuglink.length() > 0)
+		{
+			/* Look for separate debug info: debug-links */
+			std::string debugPath = lookupDebuglinkFile();
+
+			if (debugPath == "" && m_isMainFile)
+				kcov_debug(ELF_MSG, "Cannot open debug-link file in standard locations\n");
+			else
+				rv = dp.open(debugPath);
+		}
+
+		if (!rv)
+		{
+			if (m_isMainFile)
+				warning("kcov requires binaries built with -g/-ggdb, a build-id file\n"
+						"or GNU debug link information.\n");
+			kcov_debug(ELF_MSG, "No debug symbols in %s.\n", m_filename.c_str());
+
+			return false;
+		}
+
+		/* Iterate over the headers */
+		dp.forEachLine(*this);
+
+		if (m_invalidBreakpoints > 0)
+		{
+			kcov_debug(STATUS_MSG, "kcov: %u invalid breakpoints skipped in %s\n", m_invalidBreakpoints, m_filename.c_str());
+		}
+
+		return true;
+	}
+
+	bool parseOneElf()
+	{
+		m_elf = IElf::create(m_filename);
+
+		if (!m_elf)
+			return false;
+
+		size_t sz;
+		void *p;
+
+		p = m_elf->getRawData(sz);
+		m_addressVerifier.setup(p, EI_NIDENT);
+
+		SegmentList_t segments = m_elf->getSegments();
+		if (m_curSegments.empty())
+			m_curSegments = segments;
+
+		for (SegmentList_t::iterator it = segments.begin(); it != segments.end(); ++it)
+			m_executableSegments.push_back(*it);
+
+		// Gcov data
+		std::vector<std::string> gcdaFiles = m_elf->getGcovGcdaFiles();
+		for (std::vector<std::string>::iterator it = gcdaFiles.begin(); it != gcdaFiles.end(); ++it)
+		{
+			for (FileListenerList_t::const_iterator lit = m_fileListeners.begin(); lit != m_fileListeners.end(); ++lit)
+				(*lit)->onFile(File(*it, IFileParser::FLG_TYPE_COVERAGE_DATA));
+		}
+
+		m_gcnoFiles = m_elf->getGcovGcnoFiles();
+		m_buildId = m_elf->getBuildId();
+
+		const std::pair<std::string, uint32_t> *dbgLink = m_elf->getDebugLink();
+		if (dbgLink)
+		{
+			m_debuglink = dbgLink->first;
+			m_debuglinkCrc = dbgLink->second;
+		}
+
+		return true;
+	}
+
+	void registerLineListener(IFileParser::ILineListener &listener)
+	{
+		m_lineListeners.push_back(&listener);
+	}
+
+	void registerFileListener(IFileParser::IFileListener &listener)
+	{
+		m_fileListeners.push_back(&listener);
+	}
+
+private:
+	typedef std::vector<IFileParser::ILineListener *> LineListenerList_t;
+	typedef std::vector<IFileListener *> FileListenerList_t;
+	typedef std::vector<std::string> FileList_t;
+
+	bool addressIsValid(uint64_t addr, unsigned &invalidBreakpoints) const
+	{
+		for (SegmentList_t::const_iterator it = m_executableSegments.begin(); it != m_executableSegments.end(); ++it)
+		{
+			if (it->addressIsWithinSegment(addr))
+			{
+				bool out = true;
+
+				if (m_verifyAddresses)
+				{
+					out = m_addressVerifier.verify(addr);
+
+					if (!out)
+					{
+						kcov_debug(ELF_MSG, "kcov: Address 0x%llx is not at an instruction boundary, skipping\n",
+								(unsigned long long) addr);
+						invalidBreakpoints++;
+					}
+				}
+
+				return out;
+			}
+		}
+
+		return false;
+	}
+
+	uint64_t adjustAddressBySegment(uint64_t addr)
+	{
+		for (SegmentList_t::const_iterator it = m_curSegments.begin(); it != m_curSegments.end(); ++it)
+		{
+			if (it->addressIsWithinSegment(addr))
+			{
+				addr = it->adjustAddress(addr);
+				break;
+			}
+		}
+
+		return addr;
+	}
+
+	// From IFileParser::ILineListener
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+		if (!addressIsValid(addr, m_invalidBreakpoints))
+			return;
+
+		std::string rp = m_filter->mangleSourcePath(file);
+
+		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
+			(*it)->onLine(rp, lineNr, adjustAddressBySegment(addr) + m_relocation);
+	}
+
+	std::string tryDebugLink(const std::string &path)
+	{
+		if (!file_exists(path))
+			return "";
+
+		size_t sz;
+		uint8_t *p = (uint8_t *) read_file(&sz, "%s", path.c_str());
+		if (!p)
+			return "";
+		uint32_t crc = debugLinkCrc32(0, p, sz);
+		free(p);
+
+		if (crc != m_debuglinkCrc)
+		{
+			kcov_debug(ELF_MSG, "CRC mismatch for debug link %s. Should be 0x%08x, is 0x%08x!\n", path.c_str(),
+					m_debuglinkCrc, crc);
+			return "";
+		}
+
+		return path;
+	}
+
+	std::string lookupDebuglinkFile()
+	{
+		std::string filePath;
+		std::string debugPath;
+		char *cpy;
+
+		cpy = ::strdup(m_filename.c_str());
+		filePath = std::string(::dirname(cpy));
+		free(cpy);
+
+		// Use debug link from the ELF (same directory as binary)
+		debugPath = tryDebugLink(fmt("%s/%s", filePath.c_str(), m_debuglink.c_str()));
+		if (debugPath != "")
+			return debugPath;
+
+		// Same directory .debug
+		debugPath = tryDebugLink(fmt("%s/.debug/%s", filePath.c_str(), m_debuglink.c_str()));
+		if (debugPath != "")
+			return debugPath;
+
+		return tryDebugLink(fmt("/usr/lib/debug/%s/%s", get_real_path(filePath).c_str(), m_debuglink.c_str()));
+	}
+
+	// From https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
+	uint32_t debugLinkCrc32(uint32_t crc, unsigned char *buf, size_t len)
+	{
+		static const uint32_t crc32_table[256] =
+		{ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832,
+				0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+				0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a,
+				0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+				0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+				0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+				0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
+				0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+				0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
+				0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+				0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074,
+				0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+				0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525,
+				0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+				0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+				0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+				0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76,
+				0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+				0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
+				0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+				0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
+				0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+				0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7,
+				0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+				0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+				0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+				0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330,
+				0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+				0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
+		unsigned char *end;
+
+		crc = ~crc & 0xffffffff;
+		for (end = buf + len; buf < end; ++buf)
+			crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
+
+		return ~crc & 0xffffffff;
+	}
+
+	SegmentList_t m_curSegments;
+	SegmentList_t m_executableSegments;
+	FileList_t m_gcnoFiles;
+
+	IDisassembler &m_addressVerifier;
+	bool m_verifyAddresses;
+	IElf *m_elf;
+	bool m_elfIs32Bit;
+	bool m_elfIsShared;
+	LineListenerList_t m_lineListeners;
+	FileListenerList_t m_fileListeners;
+	std::string m_filename;
+	std::string m_buildId;
+	std::string m_debuglink;
+	uint32_t m_debuglinkCrc;
+	bool m_isMainFile;
+	uint64_t m_checksum;
+	bool m_initialized;
+	uint64_t m_relocation;
+	uint32_t m_invalidBreakpoints;
+
+	/***** Add strings to update path information. *******/
+	std::string m_origRoot;
+	std::string m_newRoot;
+
+	IFilter *m_filter;
+};
+
+static ElfInstance g_instance;
diff --git a/kcov-38/src/parsers/elf.cc b/kcov-38/src/parsers/elf.cc
new file mode 100644
index 000000000000..4faa3d8c7352
--- /dev/null
+++ b/kcov-38/src/parsers/elf.cc
@@ -0,0 +1,275 @@
+#include <elf.hh>
+
+#include <configuration.hh>
+
+#include <elfutils/libdw.h>
+
+using namespace kcov;
+
+class ElfImpl : public IElf
+{
+public:
+	ElfImpl(void *data, size_t size) :
+			m_debugLinkValid(false), m_fileData((char *) data), m_fileSize(size)
+	{
+		parse();
+	}
+
+	~ElfImpl()
+	{
+	}
+
+	virtual const std::vector<std::string> &getGcovGcdaFiles()
+	{
+		return m_gcdaFiles;
+	}
+
+	virtual const std::vector<std::string> &getGcovGcnoFiles()
+	{
+		return m_gcnoFiles;
+	}
+
+	virtual const std::string &getBuildId()
+	{
+		return m_buildId;
+	}
+
+	virtual const std::pair<std::string, uint32_t> *getDebugLink()
+	{
+		if (m_debugLinkValid)
+			return &m_debugLink;
+
+		return NULL;
+	}
+
+	virtual const std::vector<Segment> &getSegments()
+	{
+		return m_segments;
+	}
+
+	virtual void *getRawData(size_t &sz)
+	{
+		sz = m_fileSize;
+		return m_fileData;
+	}
+
+private:
+	typedef std::vector<std::string> FileList_t;
+
+	bool parse()
+	{
+		struct Elf *elf;
+		bool elfIs32Bit = true;
+
+		Elf_Scn *scn = NULL;
+		size_t shstrndx;
+		bool ret = false;
+		bool doScanForGcda = IConfiguration::getInstance().keyAsInt("gcov");
+		unsigned int i;
+		char *raw;
+		size_t sz;
+
+		if (!(elf = elf_memory((char *) m_fileData, m_fileSize)))
+		{
+			error("elf_begin failed\n");
+			return false;
+		}
+
+		if (elf_getshdrstrndx(elf, &shstrndx) < 0)
+		{
+			error("elf_getshstrndx failed\n");
+			goto out_elf_begin;
+		}
+
+		raw = elf_getident(elf, &sz);
+
+		if (raw && sz > EI_CLASS)
+			elfIs32Bit = raw[EI_CLASS] == ELFCLASS32;
+
+		while ((scn = elf_nextscn(elf, scn)) != NULL)
+		{
+			uint64_t sh_type;
+			uint64_t sh_addr;
+			uint64_t sh_size;
+			uint64_t sh_flags;
+			uint64_t sh_name;
+			uint64_t sh_offset;
+			uint64_t n_namesz;
+			uint64_t n_descsz;
+			uint64_t n_type;
+			char *n_data;
+			char *name;
+
+			if (elfIs32Bit)
+			{
+				Elf32_Shdr *shdr32 = elf32_getshdr(scn);
+
+				sh_type = shdr32->sh_type;
+				sh_addr = shdr32->sh_addr;
+				sh_size = shdr32->sh_size;
+				sh_flags = shdr32->sh_flags;
+				sh_name = shdr32->sh_name;
+				sh_offset = shdr32->sh_offset;
+			}
+			else
+			{
+				Elf64_Shdr *shdr64 = elf64_getshdr(scn);
+
+				sh_type = shdr64->sh_type;
+				sh_addr = shdr64->sh_addr;
+				sh_size = shdr64->sh_size;
+				sh_flags = shdr64->sh_flags;
+				sh_name = shdr64->sh_name;
+				sh_offset = shdr64->sh_offset;
+			}
+
+			Elf_Data *data = elf_getdata(scn, NULL);
+
+			// Nothing there?
+			if (!data)
+				continue;
+
+			if (!data->d_buf)
+				continue;
+
+			name = elf_strptr(elf, shstrndx, sh_name);
+			if (!data)
+			{
+				error("elf_getdata failed on section %s\n", name);
+				goto out_elf_begin;
+			}
+
+			// Parse rodata to find gcda files
+			if (doScanForGcda && strcmp(name, ".rodata") == 0)
+			{
+				const char *dataPtr = (const char *) data->d_buf;
+
+				for (size_t i = 0; i < data->d_size - 5; i++)
+				{
+					const char *p = &dataPtr[i];
+
+					if (memcmp(p, (const void *) "gcda\0", 5) != 0)
+						continue;
+
+					const char *gcda = p;
+
+					// Rewind to start of string
+					while (gcda != dataPtr && *gcda != '\0')
+						gcda--;
+
+					// Rewound until start of rodata?
+					if (gcda == dataPtr)
+						continue;
+
+					std::string file(gcda + 1);
+
+					m_gcdaFiles.push_back(file);
+				}
+			}
+
+			if (sh_type == SHT_NOTE)
+			{
+				if (elfIs32Bit)
+				{
+					Elf32_Nhdr *nhdr32 = (Elf32_Nhdr *) data->d_buf;
+
+					n_namesz = nhdr32->n_namesz;
+					n_descsz = nhdr32->n_descsz;
+					n_type = nhdr32->n_type;
+					n_data = (char *) data->d_buf + sizeof(Elf32_Nhdr);
+				}
+				else
+				{
+					Elf64_Nhdr *nhdr64 = (Elf64_Nhdr *) data->d_buf;
+
+					n_namesz = nhdr64->n_namesz;
+					n_descsz = nhdr64->n_descsz;
+					n_type = nhdr64->n_type;
+					n_data = (char *) data->d_buf + sizeof(Elf64_Nhdr);
+				}
+
+				if (::strcmp(n_data, ELF_NOTE_GNU) == 0 && n_type == NT_GNU_BUILD_ID)
+				{
+					const char *hex_digits = "0123456789abcdef";
+					unsigned char *build_id;
+
+					build_id = (unsigned char *) n_data + n_namesz;
+					for (i = 0; i < n_descsz; i++)
+					{
+						m_buildId.push_back(hex_digits[(build_id[i] >> 4) & 0xf]);
+						m_buildId.push_back(hex_digits[(build_id[i] >> 0) & 0xf]);
+					}
+				}
+			}
+
+			// Check for debug links
+			if (strcmp(name, ".gnu_debuglink") == 0)
+			{
+				const char *p = (const char *) data->d_buf;
+				m_debugLink.first.append(p);
+				const char *endOfString = p + strlen(p) + 1;
+
+				// Align address for the CRC32
+				unsigned long addr = (unsigned long) (endOfString - p);
+				unsigned long offs = 0;
+
+				if ((addr & 3) != 0)
+					offs = 4 - (addr & 3);
+				// ... and read out the CRC32
+				memcpy((void *) &m_debugLink.second, endOfString + offs, sizeof(m_debugLink.second));
+				m_debugLinkValid = true;
+			}
+
+			if ((sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) != (SHF_EXECINSTR | SHF_ALLOC))
+				continue;
+
+			Segment seg(m_fileData + sh_offset, sh_addr, sh_addr, sh_size);
+
+			m_segments.push_back(seg);
+		}
+
+		// If we have gcda files, try to find the corresponding gcno dittos
+		for (FileList_t::iterator it = m_gcdaFiles.begin(); it != m_gcdaFiles.end(); ++it)
+		{
+			std::string &gcno = *it; // Modify in-place
+			size_t sz = gcno.size();
+
+			// .gcda -> .gcno
+			gcno[sz - 2] = 'n';
+			gcno[sz - 1] = 'o';
+
+			if (file_exists(gcno))
+				m_gcnoFiles.push_back(gcno);
+		}
+
+		ret = true;
+
+out_elf_begin:
+		elf_end(elf);
+
+		return ret;
+	}
+
+	std::vector<std::string> m_gcnoFiles;
+	std::vector<std::string> m_gcdaFiles;
+	std::string m_buildId;
+	bool m_debugLinkValid;
+	std::pair<std::string, uint32_t> m_debugLink;
+	std::vector<Segment> m_segments;
+
+	char *m_fileData;
+	size_t m_fileSize;
+};
+
+IElf *IElf::create(const std::string &filename)
+{
+	size_t sz;
+	void *data;
+
+	// The data is freed by the parser
+	data = read_file(&sz, "%s", filename.c_str());
+	if (!data)
+		return NULL;
+
+	return new ElfImpl(data, sz);
+}
diff --git a/kcov-38/src/parsers/libdwarf-dwarf.cpp b/kcov-38/src/parsers/libdwarf-dwarf.cpp
new file mode 100644
index 000000000000..249ec33356e8
--- /dev/null
+++ b/kcov-38/src/parsers/libdwarf-dwarf.cpp
@@ -0,0 +1,9 @@
+//
+//  libdwarf-dwarf.cpp
+//  kcov
+//
+//  Created by Simon Kågström on 31/10/16.
+//
+//
+
+#include <stdio.h>
diff --git a/kcov-38/src/reporter.cc b/kcov-38/src/reporter.cc
new file mode 100644
index 000000000000..c599c3d93f64
--- /dev/null
+++ b/kcov-38/src/reporter.cc
@@ -0,0 +1,788 @@
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <collector.hh>
+#include <utils.hh>
+#include <filter.hh>
+#include <configuration.hh>
+#include <source-file-cache.hh>
+
+#include <string>
+#include <list>
+#include <unordered_map>
+#include <functional>
+#include <map>
+#include <fstream>
+
+#include "swap-endian.hh"
+
+using namespace kcov;
+
+#define KCOV_MAGIC      0x6b636f76 /* "kcov" */
+#define KCOV_DB_VERSION 6
+
+struct marshalHeaderStruct
+{
+	uint32_t magic;
+	uint32_t db_version;
+	uint64_t checksum;
+};
+
+class Reporter : public IReporter,
+		public IFileParser::ILineListener,
+		public IFileParser::IFileListener,
+		public ICollector::IListener,
+		public IReporter::IListener
+{
+public:
+	Reporter(IFileParser &fileParser, ICollector &collector, IFilter &filter) :
+			m_fileParser(fileParser), m_collector(collector), m_filter(filter), m_maxPossibleHits(
+					fileParser.maxPossibleHits()), m_unmarshallingDone(false), m_order(1) // "First" hit - 0 marks unset
+	{
+		m_fileParser.registerLineListener(*this);
+		m_fileParser.registerFileListener(*this);
+		m_collector.registerListener(*this);
+
+		m_hashFilename = fileParser.getParserType() == "ELF";
+
+		m_dbFileName = IConfiguration::getInstance().keyAsString("target-directory") + "/coverage.db";
+	}
+
+	~Reporter()
+	{
+		writeCoverageDatabase();
+
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *cur = it->second;
+
+			delete cur;
+		}
+	}
+
+	void registerListener(IReporter::IListener &listener)
+	{
+		m_listeners.push_back(&listener);
+	}
+
+	bool fileIsIncluded(const std::string &file)
+	{
+		return m_filter.runFilters(file);
+	}
+
+	bool lineIsCode(const std::string &file, unsigned int lineNr)
+	{
+		FileMap_t::iterator it = m_files.find(file);
+
+		// Not code if the file doesn't exist!
+		if (it == m_files.end())
+			return false;
+
+		return it->second->lineIsCode(lineNr);
+	}
+
+	LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr)
+	{
+		unsigned int hits = 0;
+		unsigned int possibleHits = 0;
+		uint64_t order = 0;
+
+		FileMap_t::const_iterator it = m_files.find(file);
+
+		if (it != m_files.end())
+		{
+			const Line *line = it->second->getLine(lineNr);
+
+			if (line && !line->isUnreachable())
+			{
+				hits = line->hits();
+				possibleHits = line->possibleHits(m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
+				order = line->getOrder();
+			}
+		}
+
+		return LineExecutionCount(hits, possibleHits, order);
+	}
+
+	ExecutionSummary getExecutionSummary()
+	{
+		unsigned int executedLines = 0;
+		unsigned int nrLines = 0;
+
+		// Summarize all files
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			const std::string &fileName = it->first;
+			const File *file = it->second;
+
+			// Don't include non-existing files in summary
+			if (!file_exists(fileName))
+				continue;
+
+			// And not filtered ones either
+			if (!m_filter.runFilters(fileName))
+				continue;
+
+			executedLines += file->getExecutedLines();
+			nrLines += file->getNrLines();
+		}
+
+		return ExecutionSummary(nrLines, executedLines);
+	}
+
+	void *marshal(size_t *szOut)
+	{
+		size_t sz = getMarshalSize();
+		void *start;
+		uint8_t *p;
+
+		start = malloc(sz);
+		if (!start)
+			return NULL;
+		memset(start, 0, sz);
+		p = marshalHeader((uint8_t *) start);
+
+		// Marshal all lines in the files
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			const File *cur = it->second;
+
+			p = cur->marshal(p, *this);
+		}
+
+		*szOut = sz;
+
+		return start;
+	}
+
+	bool unMarshal(void *data, size_t sz)
+	{
+		uint8_t *start = (uint8_t *) data;
+		uint8_t *p = start;
+		size_t n;
+
+		p = unMarshalHeader(p);
+
+		if (!p)
+			return false;
+
+		n = (sz - (p - start)) / getMarshalEntrySize();
+
+		for (size_t i = 0; i < n; i++)
+		{
+			uint64_t fileHash;
+			uint64_t addr;
+			uint64_t hits;
+			uint64_t addrIndex;
+
+			p = Line::unMarshal(p, &addr, &hits, &fileHash, &addrIndex);
+
+			if (!hits)
+				continue;
+
+			AddrToLineMap_t::iterator it = m_addrToLine.find(addr);
+
+			/*
+			 * Can't find this file/line
+			 *
+			 * Either it doesn't exist in the binary, or it hasn't been parsed
+			 * yet, which will be the case for bash/python. Add it to pending
+			 * addresses if so.
+
+			 * Typically because it's in a shared library, which hasn't been
+			 * loaded yet.
+			 */
+			if (it == m_addrToLine.end())
+			{
+				LineIdToFileMap_t::iterator lit = m_lineIdToFileMap.find(fileHash);
+
+				if (lit == m_lineIdToFileMap.end())
+				{
+					// No line ID (shared library?). Add to pending
+					m_pendingFiles[fileHash].push_back(PendingFileAddress(addrIndex, hits));
+				}
+				else
+				{
+					// line ID exists, but not address (PIEs etc)
+					reportAddress(fileHash, hits);
+
+					lit->second->registerHitIndex(addrIndex, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
+				}
+
+				continue;
+			}
+
+			// Part of this file - just report it
+			onAddressHit(addr, hits);
+		}
+
+		return true;
+	}
+
+	virtual void writeCoverageDatabase()
+	{
+		size_t sz;
+		void *data = marshal(&sz);
+
+		if (data)
+			write_file(data, sz, "%s", m_dbFileName.c_str());
+
+		free(data);
+	}
+
+private:
+	size_t getMarshalEntrySize()
+	{
+		return 4 * sizeof(uint64_t);
+	}
+
+	size_t getMarshalSize()
+	{
+		size_t out = 0;
+
+		// Sum all file sizes
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			out += it->second->marshalSize();
+		}
+
+		return out * getMarshalEntrySize() + sizeof(struct marshalHeaderStruct);
+	}
+
+	uint8_t *marshalHeader(uint8_t *p)
+	{
+		struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)p;
+
+		hdr->magic = to_be<uint32_t>(KCOV_MAGIC);
+		hdr->db_version = to_be<uint32_t>(KCOV_DB_VERSION);
+		hdr->checksum = to_be<uint64_t>(m_fileParser.getChecksum());
+
+		return p + sizeof(struct marshalHeaderStruct);
+	}
+
+	uint8_t *unMarshalHeader(uint8_t *p)
+	{
+		struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)p;
+
+		if (be_to_host<uint32_t>(hdr->magic) != KCOV_MAGIC)
+			return NULL;
+
+		if (be_to_host<uint32_t>(hdr->db_version) != KCOV_DB_VERSION)
+			return NULL;
+
+		if (be_to_host<uint64_t>(hdr->checksum) != m_fileParser.getChecksum())
+			return NULL;
+
+		return p + sizeof(struct marshalHeaderStruct);
+	}
+
+	/* Called when the file is parsed */
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+		if (!m_filter.runFilters(file))
+			return;
+
+		kcov_debug(INFO_MSG, "REPORT %s:%u at 0x%lx\n", file.c_str(), lineNr, (unsigned long) addr);
+
+		File *fp = m_files[file];
+
+		if (!fp)
+		{
+			uint64_t hash = 0;
+
+			/*
+			 * Hash filenames for ELF parsers, the contents otherwise.
+			 *
+			 * Binaries are protected by an ELF checksum, but e.g., bash scripts need
+			 * to be identified by the contents.
+			 */
+			if (!m_hashFilename)
+			{
+				size_t sz;
+				void *data = read_file(&sz, "%s", file.c_str());
+
+				// Compute checksum by contents
+				if (data)
+					hash = hash_block(data, sz);
+
+				free(data);
+			}
+			else
+			{
+				hash = m_fileHash(file);
+			}
+
+			fp = new File(hash);
+
+			// Mark unreachable lines separately (often none)
+			const std::vector<std::string> &lines = ISourceFileCache::getInstance().getLines(file);
+			for (unsigned int nr = 1; nr <= lines.size(); nr++)
+			{
+				if (!m_filter.runLineFilters(file, lineNr, lines[nr - 1]))
+				{
+					Line *line = new Line(fp->getFileHash(), nr, true);
+
+					fp->addLine(nr, line);
+				}
+			}
+
+			m_files[file] = fp;
+		}
+
+		Line *line = fp->getLine(lineNr);
+
+		if (!line)
+		{
+
+			line = new Line(fp->getFileHash(), lineNr);
+			fp->addLine(lineNr, line);
+		}
+
+		uint64_t lineId = line->lineId();
+
+		line->addAddress(addr);
+		m_addrToLine[addr] = line;
+		m_lineIdToFileMap[lineId] = line;
+
+		// Report pending addresses for this file/line
+		PendingFilesMap_t::const_iterator it = m_pendingFiles.find(lineId);
+		if (it != m_pendingFiles.end())
+		{
+			for (PendingHitsList_t::const_iterator fit = it->second.begin(); fit != it->second.end(); ++fit)
+			{
+				const PendingFileAddress &val = *fit;
+				unsigned long hits = val.m_hits;
+				uint64_t index = val.m_index;
+
+				reportAddress(lineId, hits);
+
+				line->registerHitIndex(index, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
+			}
+
+			// Handled now
+			m_pendingFiles[lineId].clear();
+		}
+
+		for (ListenerList_t::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+			(*it)->onLineReporter(file, lineNr, lineId);
+	}
+
+	// Called when a file is added (e.g., a shared library)
+	void onFile(const IFileParser::File &file)
+	{
+		// Only unmarshal once
+		if (m_unmarshallingDone)
+			return;
+
+		if (!IConfiguration::getInstance().keyAsInt("clean-output"))
+		{
+			void *data;
+			size_t sz;
+
+			data = read_file(&sz, "%s", m_dbFileName.c_str());
+
+			if (data && !unMarshal(data, sz))
+				kcov_debug(INFO_MSG, "Can't unmarshal %s\n", m_dbFileName.c_str());
+
+			free(data);
+		}
+		m_unmarshallingDone = true;
+	}
+
+	/* Called during runtime */
+	void reportAddress(uint64_t lineHash, unsigned long hits)
+	{
+		// Report the line hash (losing partial hit info from now on, but
+		// that's only for the merge-reporter anyway)
+		for (ListenerList_t::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+			(*it)->onAddress(lineHash, hits);
+	}
+
+	// From ICollector::IListener
+	void onAddressHit(uint64_t addr, unsigned long hits)
+	{
+		AddrToLineMap_t::iterator it = m_addrToLine.find(addr);
+
+		if (it == m_addrToLine.end())
+			return;
+
+		kcov_debug(INFO_MSG, "REPORT hit at 0x%llx\n", (unsigned long long) addr);
+		Line *line = it->second;
+
+		line->registerHit(addr, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
+
+		// Setup the hit order
+		if (line->getOrder() == 0)
+		{
+			line->setOrder(m_order);
+			m_order++;
+		}
+
+		reportAddress(line->lineId(), hits);
+	}
+
+	// From IReporter::IListener - report recursively
+	void onAddress(uint64_t addr, unsigned long hits)
+	{
+	}
+
+	class Line
+	{
+	public:
+		// More efficient than an unordered_map
+		typedef std::vector<std::pair<uint64_t, int>> AddrToHitsMap_t;
+
+		Line(uint64_t fileHash, unsigned int lineNr, bool unreachable = false) :
+				m_lineId((fileHash << 32ULL) | lineNr), m_order(0), m_unreachable(unreachable)
+		{
+		}
+
+		bool isUnreachable() const
+		{
+			return m_unreachable;
+		}
+
+		uint64_t getOrder() const
+		{
+			return m_order;
+		}
+
+		void setOrder(uint64_t order)
+		{
+			m_order = order;
+		}
+
+		void addAddress(uint64_t addr)
+		{
+			// Check if it already exists
+			for (AddrToHitsMap_t::iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
+			{
+				if (it->first == addr)
+					return;
+			}
+
+			m_addrs.push_back(std::pair<uint64_t, int>(addr, 0));
+		}
+
+		void registerHit(uint64_t addr, unsigned long hits, bool singleShot)
+		{
+			AddrToHitsMap_t::iterator it;
+
+			for (it = m_addrs.begin(); it != m_addrs.end(); ++it)
+			{
+				if (it->first == addr)
+					break;
+			}
+
+			// Add one last
+			if (it == m_addrs.end())
+			{
+				m_addrs.push_back(std::pair<uint64_t, int>(addr, 0));
+				--it;
+			}
+
+			if (singleShot)
+				it->second = 1;
+			else
+				it->second += hits;
+		}
+
+		void registerHitIndex(uint64_t index, unsigned long hits, bool singleShot)
+		{
+			// Avoid broken data
+			if (m_addrs.size() <= index)
+				return;
+
+			m_addrs[index].second += hits;
+		}
+
+		void clearHits()
+		{
+			for (AddrToHitsMap_t::iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
+				it->second = 0;
+		}
+
+		unsigned int hits() const
+		{
+			unsigned int out = 0;
+
+			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
+				out += it->second;
+
+			return out;
+		}
+
+		unsigned int possibleHits(bool singleShot) const
+		{
+			if (singleShot)
+				return m_addrs.size();
+
+			return 0; // Meaning any number of hits are possible
+		}
+
+		uint64_t lineId() const
+		{
+			return m_lineId;
+		}
+
+		uint8_t *marshal(uint8_t *start, const Reporter &parent)
+		{
+			uint64_t *data = (uint64_t *) start;
+			unsigned int addrIndex = 0;
+
+			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it, addrIndex++)
+			{
+				// No hits? Ignore if so
+				if (!it->second)
+					continue;
+
+				uint64_t hash = m_lineId;
+				uint64_t addr = it->first;
+
+				// Address, hash, index and number of hits
+				*data++ = to_be<uint64_t>(addr);
+				*data++ = to_be<uint64_t>(hash);
+				*data++ = to_be<uint64_t>(addrIndex);
+				*data++ = to_be<uint64_t>(it->second);
+			}
+
+			return (uint8_t *) data;
+		}
+
+		size_t marshalSize() const
+		{
+			unsigned int n = 0;
+
+			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
+			{
+				// No hits? Ignore if so
+				if (!it->second)
+					continue;
+
+				n++;
+			}
+
+			// Address, file hash and number of hits (64-bit values)
+			return n * sizeof(uint64_t) * 4;
+		}
+
+		static uint8_t *unMarshal(uint8_t *p, uint64_t *outAddr, uint64_t *outHits, uint64_t *outFileHash,
+				uint64_t *outIndex)
+		{
+			uint64_t *data = (uint64_t *) p;
+
+			*outAddr = be_to_host<uint64_t>(*data++);
+			*outFileHash = be_to_host<uint64_t>(*data++);
+			*outIndex = be_to_host<uint64_t>(*data++);
+			*outHits = be_to_host<uint64_t>(*data++);
+
+			return (uint8_t *) data;
+		}
+
+	private:
+		AddrToHitsMap_t m_addrs;
+		uint64_t m_lineId;
+		uint64_t m_order;
+		bool m_unreachable;
+	};
+
+	class File
+	{
+	public:
+		File(uint64_t hash) :
+				m_fileHash(hash), m_nrLines(0)
+		{
+		}
+
+		~File()
+		{
+			for (unsigned int i = 0; i < m_lines.size(); i++)
+			{
+				Line *cur = m_lines[i];
+
+				if (!cur)
+					continue;
+
+				delete cur;
+			}
+		}
+
+		void addLine(unsigned int lineNr, Line *line)
+		{
+			// Resize the vector to fit this line
+			if (lineNr >= m_lines.size())
+				m_lines.resize(lineNr + 1);
+
+			m_lines[lineNr] = line;
+			if (!line->isUnreachable())
+				m_nrLines++;
+		}
+
+		Line *getLine(unsigned int lineNr) const
+		{
+			if (lineNr >= m_lines.size())
+				return NULL;
+
+			return m_lines[lineNr];
+		}
+
+		uint64_t getFileHash() const
+		{
+			return m_fileHash;
+		}
+
+		// Marshal all line data
+		uint8_t *marshal(uint8_t *p, const Reporter &reporter) const
+		{
+			for (unsigned int i = 0; i < m_lines.size(); i++)
+			{
+				Line *cur = m_lines[i];
+
+				if (!cur)
+					continue;
+
+				p = cur->marshal(p, reporter);
+			}
+
+			return p;
+		}
+
+		size_t marshalSize() const
+		{
+			size_t out = 0;
+
+			for (unsigned int i = 0; i < m_lines.size(); i++)
+			{
+				Line *cur = m_lines[i];
+
+				if (!cur)
+					continue;
+
+				out += cur->marshalSize();
+			}
+
+			return out;
+		}
+
+		unsigned int getExecutedLines() const
+		{
+			unsigned int out = 0;
+
+			for (unsigned int i = 0; i < m_lines.size(); i++)
+			{
+				Line *cur = m_lines[i];
+
+				if (!cur)
+					continue;
+
+				if (cur->isUnreachable())
+					continue;
+
+				// Hits as zero or one (executed or not)
+				out += !!cur->hits();
+			}
+
+			return out;
+		}
+
+		unsigned int getNrLines() const
+		{
+			return m_nrLines;
+		}
+
+		bool lineIsCode(unsigned int lineNr) const
+		{
+			if (lineNr >= m_lines.size())
+				return false;
+
+			if (!m_lines[lineNr])
+				return false;
+
+			return !m_lines[lineNr]->isUnreachable();
+		}
+
+	private:
+		uint64_t m_fileHash;
+		std::vector<Line *> m_lines;
+		unsigned int m_nrLines;
+	};
+
+	class PendingFileAddress
+	{
+	public:
+		PendingFileAddress(uint64_t index, unsigned long hits) :
+				m_index(index), m_hits(hits)
+		{
+		}
+
+		uint64_t m_index;
+		unsigned long m_hits;
+	};
+
+	typedef std::unordered_map<std::string, File *> FileMap_t;
+	typedef std::unordered_map<uint64_t, Line *> AddrToLineMap_t;
+	typedef std::unordered_map<uint64_t, unsigned long> AddrToHitsMap_t;
+	typedef std::vector<IReporter::IListener *> ListenerList_t;
+	typedef std::unordered_map<uint64_t, Line *> LineIdToFileMap_t;
+	typedef std::vector<PendingFileAddress> PendingHitsList_t; // Address, hits
+	typedef std::unordered_map<uint64_t, PendingHitsList_t> PendingFilesMap_t;
+
+	FileMap_t m_files;
+	AddrToLineMap_t m_addrToLine;
+	AddrToHitsMap_t m_pendingHits;
+	ListenerList_t m_listeners;
+	PendingFilesMap_t m_pendingFiles;
+	LineIdToFileMap_t m_lineIdToFileMap;
+	std::hash<std::string> m_fileHash;
+	bool m_hashFilename;
+
+	IFileParser &m_fileParser;
+	ICollector &m_collector;
+	IFilter &m_filter;
+	enum IFileParser::PossibleHits m_maxPossibleHits;
+
+	bool m_unmarshallingDone;
+	std::string m_dbFileName;
+
+	uint64_t m_order;
+};
+
+// The merge mode doesn't have/need a proper reporter
+class DummyReporter : public IReporter
+{
+	virtual void registerListener(IListener &listener)
+	{
+	}
+
+	virtual bool fileIsIncluded(const std::string &file)
+	{
+		return false;
+	}
+
+	virtual bool lineIsCode(const std::string &file, unsigned int lineNr)
+	{
+		return false;
+	}
+
+	virtual LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr)
+	{
+		return LineExecutionCount(0, 0, 0);
+	}
+	virtual ExecutionSummary getExecutionSummary()
+	{
+		return ExecutionSummary();
+	}
+
+	void writeCoverageDatabase()
+	{
+	}
+};
+
+IReporter &IReporter::create(IFileParser &parser, ICollector &collector, IFilter &filter)
+{
+	return *new Reporter(parser, collector, filter);
+}
+
+IReporter &IReporter::createDummyReporter()
+{
+	return *new DummyReporter();
+}
diff --git a/kcov-38/src/solib-handler.cc b/kcov-38/src/solib-handler.cc
new file mode 100644
index 000000000000..7fae02eb7ac7
--- /dev/null
+++ b/kcov-38/src/solib-handler.cc
@@ -0,0 +1,281 @@
+#include <solib-handler.hh>
+#include <collector.hh>
+#include <output-handler.hh>
+#include <configuration.hh>
+#include <capabilities.hh>
+#include <file-parser.hh>
+#include <utils.hh>
+#include <phdr_data.h>
+#include <generated-data-base.hh>
+
+#include <mutex>
+#include <vector>
+#include <unordered_map>
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+
+using namespace kcov;
+
+extern GeneratedData __library_data;
+
+class SolibHandler : public ISolibHandler, ICollector::IEventTickListener
+{
+public:
+	SolibHandler(IFileParser &parser, ICollector &collector) :
+			m_ldPreloadString(NULL), m_envString(NULL), m_solibFd(-1), m_solibThreadValid(false), m_threadShouldExit(false),
+			m_parser(&parser), m_hasSetupRelocation(false)
+	{
+		memset(&m_solibThread, 0, sizeof(m_solibThread));
+
+		// Only useful for ELF binaries
+		if (parser.getParserType() == "ELF" && !IConfiguration::getInstance().keyAsInt("gcov")
+				&& !IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
+			collector.registerEventTickListener(*this);
+	}
+
+	virtual ~SolibHandler()
+	{
+		void *rv;
+
+		m_threadShouldExit = true;
+		if (m_solibPath != "")
+			unlink(m_solibPath.c_str());
+		if (m_solibDirectory != "")
+			rmdir(m_solibDirectory.c_str());
+		if (m_solibFd >= 0)
+			close(m_solibFd);
+
+		/*
+		 * First kill the solib thread if it's stuck in open (i.e., before
+		 * the tracee has started), then wait for it to terminate for maximum
+		 * niceness.
+		 *
+		 * Only do this if it has been started, naturally
+		 */
+		if (m_solibThreadValid)
+		{
+			pthread_cancel(m_solibThread);
+			pthread_kill(m_solibThread, SIGTERM);
+			pthread_join(m_solibThread, &rv);
+		}
+	}
+
+	// From IEventTickListener
+	void onTick()
+	{
+		checkSolibData();
+	}
+
+	void startup()
+	{
+		if (m_parser->getParserType() != "ELF")
+			return;
+
+		std::string kcov_solib_pipe_path = IOutputHandler::getInstance().getOutDirectory() + "kcov-solib.pipe";
+		std::string kcov_solib_path = IOutputHandler::getInstance().getBaseDirectory() + "libkcov_sowrapper.so";
+
+		// Skip this very special library
+		m_foundSolibs[get_real_path(kcov_solib_path)] = true;
+
+		write_file(__library_data.data(), __library_data.size(), "%s", kcov_solib_path.c_str());
+
+		unlink(kcov_solib_pipe_path.c_str());
+
+		int rv = mkfifo(kcov_solib_pipe_path.c_str(), 0644);
+		if (rv < 0)
+		{
+			char buf[1024];
+
+			const char* tmpdir = getenv("TMPDIR");
+			if (!tmpdir)
+				tmpdir = "/tmp";
+
+			snprintf(buf, sizeof(buf), "%s/kcov-solibXXXXXX", tmpdir);
+
+			char *dir = mkdtemp(buf);
+
+			if (!dir)
+				panic("Can't create temporary directory\n");
+			m_solibDirectory = dir;
+
+			kcov_solib_pipe_path = fmt("%s/kcov-solib.pipe", dir);
+
+			rv = mkfifo(kcov_solib_pipe_path.c_str(), 0644);
+			if (rv < 0)
+				panic("Can't create kcov fifo in temp dir %s\n", dir);
+		}
+
+		std::string kcov_solib_env = "KCOV_SOLIB_PATH=" + kcov_solib_pipe_path;
+
+		free(m_envString);
+		m_envString = (char *) xmalloc(kcov_solib_env.size() + 1);
+		strcpy(m_envString, kcov_solib_env.c_str());
+
+		std::string preloadEnv = std::string("LD_PRELOAD=" + kcov_solib_path).c_str();
+		free(m_ldPreloadString);
+		m_ldPreloadString = (char *) xmalloc(preloadEnv.size() + 1);
+		strcpy(m_ldPreloadString, preloadEnv.c_str());
+
+		if (IConfiguration::getInstance().keyAsInt("parse-solibs")
+				&& ICapabilities::getInstance().hasCapability("handle-solibs"))
+		{
+			if (file_exists(kcov_solib_path))
+				putenv(m_ldPreloadString);
+		}
+		putenv(m_envString);
+
+		m_solibPath = kcov_solib_pipe_path;
+		pthread_create(&m_solibThread, NULL, SolibHandler::threadStatic, (void *) this);
+
+	}
+
+	void solibThreadParse()
+	{
+		uint8_t buf[1024 * 1024];
+
+		m_solibFd = ::open(m_solibPath.c_str(), O_RDONLY);
+		m_solibThreadValid = true;
+
+		if (m_solibFd < 0)
+			return;
+
+		while (1)
+		{
+			int r = read(m_solibFd, buf, sizeof(buf));
+
+			// The destructor will close m_solibFd, so we'll exit here in that case
+			if (r <= 0)
+				break;
+
+			panic_if((unsigned )r >= sizeof(buf), "Too much solib data read");
+
+			struct phdr_data *p = phdr_data_unmarshal(buf);
+
+			if (p)
+			{
+				size_t sz = sizeof(struct phdr_data) + p->n_entries * sizeof(struct phdr_data_entry);
+				struct phdr_data *cpy = (struct phdr_data*) xmalloc(sz);
+
+				memcpy(cpy, p, sz);
+
+				m_phdrListMutex.lock();
+				m_phdrs.push_back(cpy);
+				m_phdrListMutex.unlock();
+			}
+			m_solibDataReadSemaphore.notify();
+		}
+
+		m_solibDataReadSemaphore.notify();
+		close(m_solibFd);
+	}
+
+	void solibThreadMain()
+	{
+		while (1)
+		{
+			if (m_threadShouldExit)
+				break;
+
+			solibThreadParse();
+		}
+	}
+
+	// Wrapper for ptrace
+	static void *threadStatic(void *pThis)
+	{
+		SolibHandler *p = (SolibHandler *) pThis;
+
+		p->solibThreadMain();
+
+		return NULL;
+	}
+
+	void checkSolibData()
+	{
+		struct phdr_data *p = NULL;
+
+		if (!m_parser)
+			return;
+
+		m_phdrListMutex.lock();
+		if (!m_phdrs.empty())
+		{
+			p = m_phdrs.front();
+			m_phdrs.pop_front();
+		}
+		m_phdrListMutex.unlock();
+
+		if (!p)
+			return;
+
+		// Setup where the main file is relocated once (for PIEs)
+		if (!m_hasSetupRelocation)
+		{
+			m_hasSetupRelocation = true;
+			m_parser->setMainFileRelocation(p->relocation);
+		}
+
+		for (unsigned int i = 0; i < p->n_entries; i++)
+		{
+			struct phdr_data_entry *cur = &p->entries[i];
+
+			if (strlen(cur->name) == 0)
+				continue;
+
+			if (m_foundSolibs.find(cur->name) != m_foundSolibs.end())
+				continue;
+
+			m_parser->addFile(cur->name, cur);
+			m_parser->parse();
+
+			m_foundSolibs[cur->name] = true;
+		}
+
+		free(p);
+	}
+
+//private:
+
+	typedef std::list<struct phdr_data *> PhdrList_t;
+	typedef std::unordered_map<std::string, bool> FoundSolibsMap_t;
+
+	std::string m_solibPath;
+	std::string m_solibDirectory;
+	char *m_ldPreloadString;
+	char *m_envString;
+	int m_solibFd;
+	bool m_solibThreadValid;
+	bool m_threadShouldExit;
+	pthread_t m_solibThread;
+	Semaphore m_solibDataReadSemaphore;
+	PhdrList_t m_phdrs;
+	FoundSolibsMap_t m_foundSolibs;
+	std::mutex m_phdrListMutex;
+
+	IFileParser *m_parser;
+	bool m_hasSetupRelocation;
+};
+
+static SolibHandler *g_handler;
+ISolibHandler &kcov::createSolibHandler(IFileParser &parser, ICollector &collector)
+{
+	// OK, not very nicely encapsulated...
+	g_handler = new SolibHandler(parser, collector);
+
+	return *g_handler;
+}
+
+void kcov::blockUntilSolibDataRead()
+{
+	// If it has been started
+	if (g_handler->m_solibThreadValid)
+		g_handler->m_solibDataReadSemaphore.wait();
+}
diff --git a/kcov-38/src/solib-parser/lib.c b/kcov-38/src/solib-parser/lib.c
new file mode 100644
index 000000000000..1aa8730db02e
--- /dev/null
+++ b/kcov-38/src/solib-parser/lib.c
@@ -0,0 +1,125 @@
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <link.h>
+#include <dlfcn.h>
+
+#include <phdr_data.h>
+
+static struct phdr_data *phdr_data;
+
+static int phdrCallback(struct dl_phdr_info *info, size_t size, void *data)
+{
+	// the first entry is used to determine the executable's "base address"
+	// (which is actually the relocation for PIE)
+	if (phdr_data->n_entries == 0)
+	{
+		phdr_data->relocation = info->dlpi_addr;
+	}
+
+	phdr_data_add(phdr_data, info);
+
+	return 0;
+}
+
+static int phdrSizeCallback(struct dl_phdr_info *info, size_t size, void *data)
+{
+	size_t *ps = (size_t *)data;
+
+	*ps += sizeof(struct phdr_data_entry);
+
+	return 0;
+}
+
+static void parse_solibs(void)
+{
+	char *kcov_solib_path;
+	void *p;
+	ssize_t written;
+	size_t allocSize;
+	size_t sz;
+	int fd;
+
+	kcov_solib_path = getenv("KCOV_SOLIB_PATH");
+	if (!kcov_solib_path)
+		return;
+
+	allocSize = sizeof(struct phdr_data);
+	dl_iterate_phdr(phdrSizeCallback, &allocSize);
+
+	phdr_data = phdr_data_new(allocSize);
+	if (!phdr_data)
+	{
+		fprintf(stderr, "kcov-solib: Can't allocate %zu bytes\n", allocSize);
+		return;
+	}
+
+
+	dl_iterate_phdr(phdrCallback, NULL);
+
+	p = phdr_data_marshal(phdr_data, &sz);
+
+	fd = open(kcov_solib_path, O_WRONLY);
+	if (fd < 0)
+	{
+		fprintf(stderr, "kcov-solib: Can't open %s\n", kcov_solib_path);
+		return;
+	}
+	written = write(fd, p, sz);
+
+	if (written != sz)
+		fprintf(stderr, "kcov-solib: Can't write to solib FIFO (%zu)\n", written);
+
+	phdr_data_free(p);
+
+	close(fd);
+}
+
+static void force_breakpoint(void)
+{
+	asm volatile(
+#if defined(__i386__) || defined(__x86_64__)
+			"int3\n"
+#elif defined(__powerpc__)
+			".long 0x7fe00008\n" /* trap instruction */
+#elif defined(__arm__)
+			".long 0xfedeffe7\n" /* undefined insn */
+#elif defined(__aarch64__)
+			".long 0xd4200000\n" /* From https://github.com/scottt/debugbreak */
+#else
+# error Unsupported architecture
+#endif
+			);
+}
+
+static void *(*orig_dlopen)(const char *, int);
+void *dlopen(const char *filename, int flag)
+{
+	void *out;
+
+	if (!orig_dlopen)
+		orig_dlopen = dlsym(RTLD_NEXT, "dlopen");
+
+	out = orig_dlopen(filename, flag);
+
+	parse_solibs();
+	force_breakpoint();
+
+	return out;
+}
+
+
+void  __attribute__((constructor))kcov_solib_at_startup(void)
+{
+	parse_solibs();
+	force_breakpoint();
+}
diff --git a/kcov-38/src/solib-parser/phdr_data.c b/kcov-38/src/solib-parser/phdr_data.c
new file mode 100644
index 000000000000..57f08f3fa06f
--- /dev/null
+++ b/kcov-38/src/solib-parser/phdr_data.c
@@ -0,0 +1,108 @@
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include "phdr_data.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <link.h>
+
+#define KCOV_MAGIC         0x6b636f76 /* "kcov" */
+#define KCOV_SOLIB_VERSION 3
+
+// Add symbols missing from FreeBSD's elfutils
+#ifndef __ELF_NATIVE_CLASS
+#ifdef __LP64__
+#define __ELF_NATIVE_CLASS 64
+#else
+#define __ELF_NATIVE_CLASS 32
+#endif
+#endif
+#ifndef ElfW
+// Copied from glibc's elf/link.h
+#define ElfW(type)	_ElfW (Elf, __ELF_NATIVE_CLASS, type)
+#define _ElfW(e,w,t)	_ElfW_1 (e, w, _##t)
+#define _ElfW_1(e,w,t) e##w##t
+#endif
+
+static uint8_t data_area[4 * 1024 * 1024];
+
+struct phdr_data *phdr_data_new(size_t allocSize)
+{
+	struct phdr_data *p = (struct phdr_data *)data_area;
+
+	if (allocSize > sizeof(data_area))
+		return NULL;
+
+	p->magic = KCOV_MAGIC;
+	p->version = KCOV_SOLIB_VERSION;
+	p->relocation = 0;
+	p->n_entries = 0;
+
+	return p;
+}
+
+void phdr_data_free(struct phdr_data *p)
+{
+}
+
+
+void phdr_data_add(struct phdr_data *p, struct dl_phdr_info *info)
+{
+	uint32_t n = p->n_entries + 1;
+	uint32_t curEntry = p->n_entries;
+	int phdr;
+
+	struct phdr_data_entry *cur = &p->entries[curEntry];
+
+	memset(cur, 0, sizeof(*cur));
+	strncpy(cur->name, info->dlpi_name, sizeof(cur->name) - 1);
+
+	cur->n_segments = 0;
+	for (phdr = 0; phdr < info->dlpi_phnum; phdr++)
+	{
+		const ElfW(Phdr) *curHdr = &info->dlpi_phdr[phdr];
+		struct phdr_data_segment *seg = &cur->segments[cur->n_segments];
+
+		if (curHdr->p_type != PT_LOAD)
+			continue;
+
+		if (cur->n_segments >= sizeof(cur->segments) / sizeof(cur->segments[0]))
+		{
+			fprintf(stderr, "Too many segments\n");
+			return;
+		}
+
+		seg->paddr = curHdr->p_paddr;
+		seg->vaddr = info->dlpi_addr + curHdr->p_vaddr;
+		seg->size = curHdr->p_memsz;
+
+		cur->n_segments++;
+	}
+
+	p->n_entries = n;
+}
+
+void *phdr_data_marshal(struct phdr_data *p, size_t *out_sz)
+{
+	*out_sz = sizeof(struct phdr_data) + sizeof(struct phdr_data_entry) * p->n_entries;
+
+	return (void *)p;
+}
+
+struct phdr_data *phdr_data_unmarshal(void *p)
+{
+	struct phdr_data *out = (struct phdr_data *)p;
+
+	if (out->magic != KCOV_MAGIC)
+		return NULL;
+	if (out->version != KCOV_SOLIB_VERSION)
+		return NULL;
+	// Silly amounts of entries mean broken data
+	if (out->n_entries > 0x10000)
+		return NULL;
+
+	return out;
+}
diff --git a/kcov-38/src/source-file-cache.cc b/kcov-38/src/source-file-cache.cc
new file mode 100644
index 000000000000..6dcaf329d61c
--- /dev/null
+++ b/kcov-38/src/source-file-cache.cc
@@ -0,0 +1,112 @@
+#include <source-file-cache.hh>
+#include <utils.hh>
+
+#include <unordered_map>
+
+using namespace kcov;
+
+class SourceFileCache : public ISourceFileCache
+{
+public:
+	SourceFileCache() :
+		m_empty()
+	{
+	}
+
+	const std::vector<std::string> &getLines(const std::string &filePath)
+	{
+		const File &file = lookupFile(filePath);
+
+		return file.m_lines;
+	}
+
+	bool fileExists(const std::string &filePath)
+	{
+		const File &file = lookupFile(filePath);
+
+		return !file.m_lines.empty();
+	}
+
+	uint32_t getCrc(const std::string &filePath)
+	{
+		const File &file = lookupFile(filePath);
+
+		return file.m_crc;
+	}
+
+private:
+	class File
+	{
+	public:
+		File() :
+			m_data(NULL),
+			m_dataSize(0),
+			m_crc(0)
+		{
+		}
+
+		~File()
+		{
+			free((void*)m_data);
+		}
+
+		File(const uint8_t *data, size_t size) :
+			m_data(data), m_dataSize(size)
+		{
+			std::string fileData((const char*)m_data, size);
+
+			m_crc = hash_block(data, size);
+
+			m_lines = split_string(fileData, "\n");
+		}
+
+		const uint8_t *m_data;
+		size_t m_dataSize;
+		std::vector<std::string> m_lines;
+		uint32_t m_crc;
+	};
+
+	const File &lookupFile(const std::string filePath)
+	{
+		std::unordered_map<std::string, File *>::iterator it = m_files.find(filePath);
+
+		if (it != m_files.end())
+			return *it->second;
+
+		/* Doesn't exist - put it as empty in the cache */
+		if (!file_exists(filePath))
+		{
+			m_files[filePath] = &m_empty;
+
+			return m_empty;
+		}
+
+		size_t sz;
+		uint8_t *p = (uint8_t *)read_file(&sz, "%s", filePath.c_str());
+
+		// Can read?
+		if (p)
+			m_files[filePath] = new File(p, sz);
+		else // Unreadable, populate with empty
+			m_files[filePath] = &m_empty;
+
+		return *m_files[filePath];
+	}
+
+	File m_empty;
+
+	/* Pointer to avoid copies when populating the map. Move semantics
+	 * would be better, but is >= C++11.
+	 */
+	std::unordered_map<std::string, File *> m_files;
+};
+
+ISourceFileCache &ISourceFileCache::getInstance()
+{
+	static SourceFileCache *g_instance;
+
+	if (!g_instance)
+		g_instance = new SourceFileCache();
+
+	return *g_instance;
+}
diff --git a/kcov-38/src/system-mode/file-data.cc b/kcov-38/src/system-mode/file-data.cc
new file mode 100644
index 000000000000..e0d0bd9b6b72
--- /dev/null
+++ b/kcov-38/src/system-mode/file-data.cc
@@ -0,0 +1,280 @@
+#include <system-mode/file-data.hh>
+
+#include <utils.hh>
+
+using namespace kcov;
+
+static bool unmarshalTrailer(struct trailer *p)
+{
+	// Native-endian
+	if (p->magic != TRAILER_MAGIC)
+	{
+		return false;
+	}
+	if (p->version != TRAILER_VERSION)
+	{
+		return false;
+	}
+
+	if ((p->filename_size & 7) != 0)
+	{
+		return false;
+	}
+	if ((p->options_size & 7) != 0)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+static void marshalTrailer(struct trailer *p)
+{
+}
+
+static size_t padTo8(size_t sz)
+{
+	if (sz & 7)
+	{
+		sz += 8 - (sz & 7);
+	}
+
+	return sz;
+}
+
+// Implement zlib compression later
+static uint64_t *uncompressEntries(const void *data, uint32_t compressedSize, uint32_t uncompressedSize)
+{
+	uint64_t *out = (uint64_t *)xmalloc(uncompressedSize);
+
+	memcpy(out, data, compressedSize);
+
+	return out;
+}
+
+static void *compressEntries(uint32_t &outCompressedSize, const uint64_t *data, uint32_t dataSize)
+{
+	void *out = xmalloc(dataSize);
+
+	outCompressedSize = dataSize;
+	memcpy(out, data, dataSize);
+
+	return out;
+}
+
+
+SystemModeFile::SystemModeFile() :
+		m_id(0),
+		m_data(NULL),
+		m_fileSize(0)
+{
+}
+
+SystemModeFile::~SystemModeFile()
+{
+	free(m_data);
+}
+
+
+SystemModeFile *SystemModeFile::fromRawFile(uint32_t id, const std::string &filename, const std::string &options,
+		const void *fileData, size_t fileSize)
+{
+	SystemModeFile *out = new SystemModeFile();
+
+	bool rv = out->parse(fileData, fileSize, true);
+
+	if (!rv)
+	{
+		delete out;
+		return NULL;
+	}
+
+	out->m_id = id;
+	out->m_options = options;
+	out->m_filename = filename;
+
+	return out;
+}
+
+SystemModeFile *SystemModeFile::fromProcessedFile(const void *fileData, size_t fileSize)
+{
+	SystemModeFile *out = new SystemModeFile();
+
+	bool rv = out->parse(fileData, fileSize, false);
+
+	if (!rv)
+	{
+		delete out;
+		return NULL;
+	}
+
+	return out;
+}
+
+bool SystemModeFile::parse(const void *fileData, size_t fileSize, bool isRaw)
+{
+	if (!fileData)
+	{
+		return false;
+	}
+
+	if (fileSize == 0)
+	{
+		return false;
+	}
+
+	m_data = xmalloc(fileSize);
+	memcpy(m_data, fileData, fileSize);
+	m_fileSize = fileSize;
+
+	if (isRaw)
+	{
+		// All set
+		return true;
+	}
+
+	uint8_t *p = ( uint8_t *)fileData;
+	uint8_t *trailerStart = (p + fileSize - sizeof(struct trailer));
+	struct trailer *trailer = (struct trailer *)trailerStart;
+
+	// Trailer and data must be 8-byte aligned
+	if (((unsigned long)trailer) % 8 != 0)
+	{
+		return false;
+	}
+
+	if (!unmarshalTrailer(trailer))
+	{
+		return false;
+	}
+
+	if (trailer->filename_size + trailer->options_size + trailer->compressed_size > fileSize + sizeof(*trailer))
+	{
+		return false;
+	}
+
+
+	const char *filename = (const char *)(trailerStart - trailer->compressed_size - trailer->options_size - trailer->filename_size);
+	if (filename[trailer->filename_size - 1] != '\0')
+	{
+		return false;
+	}
+
+	const char *options = (const char *)(trailerStart - trailer->compressed_size - trailer->options_size);
+	if (options[trailer->options_size - 1] != '\0')
+	{
+		return false;
+	}
+	m_filename = filename;
+	m_options = options;
+	m_id = trailer->id;
+
+	uint64_t *entries = uncompressEntries((void *)(trailerStart - trailer->compressed_size), trailer->compressed_size, trailer->uncompressed_size);
+	if (!entries)
+	{
+		return false;
+	}
+
+	m_entries.clear();
+	m_entries.reserve(trailer->n_entries);
+	for (unsigned i = 0; i < trailer->n_entries; i++)
+	{
+		addEntry(i, entries[i]);
+	}
+	free(entries);
+
+	return true;
+}
+
+void SystemModeFile::addEntry(uint32_t index, uint64_t value)
+{
+	if (m_entries.size() <= index)
+	{
+		m_entries.resize(index + 1);
+	}
+
+	m_entries[index] = value;
+}
+
+const std::vector<uint64_t> &SystemModeFile::getEntries() const
+{
+	return m_entries;
+}
+
+uint32_t SystemModeFile::getId() const
+{
+	return m_id;
+}
+
+const std::string &SystemModeFile::getOptions() const
+{
+	return m_options;
+}
+
+const std::string &SystemModeFile::getFilename() const
+{
+	return m_filename;
+}
+
+const void *SystemModeFile::getProcessedData(size_t &outSize) const
+{
+	outSize = m_fileSize;
+
+	if (m_entries.size() == 0)
+	{
+		uint8_t *out = (uint8_t*)xmalloc(outSize);
+
+		memcpy(out, m_data, m_fileSize);
+		return out;
+	}
+
+	size_t padded = padTo8(outSize);
+
+	uint32_t filenameSize;
+	uint32_t optionsSize;
+	uint32_t uncompressedSize = m_entries.size() * sizeof(uint64_t);
+	uint32_t compressedSize;
+	void *compressed = compressEntries(compressedSize, m_entries.data(), uncompressedSize);
+	if (!compressed)
+	{
+		return NULL;
+	}
+	compressedSize = padTo8(compressedSize);
+
+	filenameSize = padTo8(m_filename.size() + 1);
+	optionsSize = padTo8(m_options.size() + 1);
+
+	outSize = padded + filenameSize + optionsSize + compressedSize + sizeof(struct trailer);
+	uint8_t *out = (uint8_t*)xmalloc(outSize);
+
+	memcpy(out, m_data, m_fileSize);
+
+	uint8_t *start = out + padded;
+	char *filename = (char *)start;
+	char *options = (char *)start + filenameSize;
+	uint8_t *trailerStart = out + outSize - sizeof(trailer);
+	struct trailer *trailer = (struct trailer *)trailerStart;
+
+	strcpy(filename, m_filename.c_str());
+	options[filenameSize - 1] = '\0';
+
+	strcpy(options, m_options.c_str());
+	options[optionsSize - 1] = '\0';
+	memcpy(start + filenameSize + optionsSize, m_entries.data(), m_entries.size() * sizeof(uint64_t));
+
+	trailer->magic = TRAILER_MAGIC;
+	trailer->version = TRAILER_VERSION;
+	trailer->n_entries = m_entries.size();
+	trailer->uncompressed_size = uncompressedSize;
+	trailer->compressed_size = compressedSize;
+	trailer->filename_size = filenameSize;
+	trailer->options_size = optionsSize;
+	trailer->id = m_id;
+
+	marshalTrailer(trailer);
+
+	// Not yet implemented
+	free(compressed);
+
+	return out;
+}
diff --git a/kcov-38/src/system-mode/registration.cc b/kcov-38/src/system-mode/registration.cc
new file mode 100644
index 000000000000..1e26c28468de
--- /dev/null
+++ b/kcov-38/src/system-mode/registration.cc
@@ -0,0 +1,66 @@
+#include <system-mode/registration.hh>
+
+#include <utils.hh>
+
+static bool unmarshalProcessEntry(struct new_process_entry *p)
+{
+	// Native endian
+	if (p->magic != NEW_PROCES_MAGIC)
+	{
+		return false;
+	}
+
+	if (p->version != NEW_PROCES_VERSION)
+	{
+		return false;
+	}
+
+	if (p->entry_size < sizeof(*p) + 1) // At least '\0' for the filename
+	{
+		return false;
+	}
+
+	// Must be NULL-terminated
+	uint16_t filenameSize = p->entry_size - sizeof(*p);
+	if (p->filename[filenameSize - 1] != '\0')
+	{
+		return false;
+	}
+
+	return true;
+}
+
+static void marshalProcessEntry(struct new_process_entry *p)
+{
+	// All native endian
+}
+
+bool parseProcessEntry(struct new_process_entry *p, uint16_t &outPid, std::string &outFilename)
+{
+	if (!unmarshalProcessEntry(p))
+	{
+		return false;
+	}
+
+	outPid = p->pid;
+	outFilename = p->filename;
+
+	return true;
+}
+
+struct new_process_entry *createProcessEntry(uint16_t pid, const std::string &filename)
+{
+	uint32_t size = sizeof(struct new_process_entry) + filename.size() + 1;
+	struct new_process_entry *entry = (struct new_process_entry *)xmalloc(size);
+
+	entry->magic = NEW_PROCES_MAGIC;
+	entry->version = NEW_PROCES_VERSION;
+	entry->entry_size = size;
+
+	entry->pid = pid;
+	strcpy(entry->filename, filename.c_str());
+
+	marshalProcessEntry(entry);
+
+	return entry;
+}
diff --git a/kcov-38/src/utils.cc b/kcov-38/src/utils.cc
new file mode 100644
index 000000000000..9b0491365007
--- /dev/null
+++ b/kcov-38/src/utils.cc
@@ -0,0 +1,722 @@
+
+#include <sched.h>
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <limits.h>
+#include <time.h>
+
+#include <utils.hh>
+
+#include <sstream>
+#include <fstream>
+#include <stdexcept>
+#include <algorithm>
+#include <unordered_map>
+
+int g_kcov_debug_mask = STATUS_MSG;
+static void* (*mocked_read_callback)(size_t* out_size, const char* path);
+static int (*mocked_write_callback)(const void* data, size_t size, const char* path);
+static bool (*mocked_file_exists_callback)(const std::string &path);
+static uint64_t (*mocked_get_file_timestamp_callback)(const std::string &path);
+
+void msleep(uint64_t ms)
+{
+	struct timespec ts;
+	uint64_t ns = ms * 1000 * 1000;
+
+	ts.tv_sec = ns / (1000 * 1000 * 1000);
+	ts.tv_nsec = ns % (1000 * 1000 * 1000);
+
+	nanosleep(&ts, NULL);
+}
+
+static void *read_file_int(size_t *out_size, uint64_t timeout, const char *path)
+{
+	uint8_t *data = NULL;
+	int fd;
+	size_t pos = 0;
+	const size_t chunk = 1024;
+	fd_set rfds;
+	struct timeval tv;
+	int ret;
+	int n;
+
+	if (mocked_read_callback)
+		return mocked_read_callback(out_size, path);
+
+	fd = open(path, O_RDONLY | O_NONBLOCK);
+	if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
+	{
+		msleep(timeout);
+
+		fd = open(path, O_RDONLY | O_NONBLOCK);
+	}
+
+	if (fd < 0)
+		return NULL;
+
+	tv.tv_sec = timeout / 1000;
+	tv.tv_usec = (timeout % 1000) * 10;
+
+	FD_ZERO(&rfds);
+	FD_SET(fd, &rfds);
+
+	do
+	{
+		ret = select(fd + 1, &rfds, NULL, NULL, &tv);
+		if (ret == -1)
+		{
+			close(fd);
+			free(data);
+
+			return NULL;
+		}
+		else if (ret == 0)
+		{ // Timeout
+			close(fd);
+			free(data);
+
+			return NULL;
+		}
+		data = (uint8_t *)xrealloc(data, pos + chunk);
+		memset(data + pos, 0, chunk);
+
+		n = read(fd, data + pos, chunk);
+		if (n < 0)
+		{
+			close(fd);
+			free(data);
+
+			return NULL;
+		}
+
+		pos += n;
+	} while (n == (int)chunk);
+
+	*out_size = pos;
+
+	close(fd);
+
+	return data;
+}
+
+void *read_file(size_t *out_size, const char *fmt, ...)
+{
+	char path[2048];
+	va_list ap;
+	int r;
+
+	/* Create the filename */
+	va_start(ap, fmt);
+	r = vsnprintf(path, 2048, fmt, ap);
+	va_end(ap);
+
+	panic_if (r >= 2048,
+			"Too long string!");
+
+	return read_file_int(out_size, 0, path);
+}
+
+void *peek_file(size_t *out_size, const char *fmt, ...)
+{
+	char path[2048];
+	va_list ap;
+	int r;
+
+	/* Create the filename */
+	va_start(ap, fmt);
+	r = vsnprintf(path, 2048, fmt, ap);
+	va_end(ap);
+
+	panic_if (r >= 2048,
+			"Too long string!");
+
+	/* Get the file status */
+	struct stat st;
+	if (lstat(path, &st) < 0)
+		return NULL;
+	// Regular file?
+	if (S_ISREG(st.st_mode) == 0)
+		return NULL;
+
+	// Read a little bit of the file    
+	const size_t to_read = 512;    
+	char *out = static_cast<char*>(xmalloc(to_read));
+    
+	std::ifstream str(path);
+	if (str.is_open())
+	{
+		str.read(out,to_read);
+		// If successful (all desired characters) or
+		// a non-zero number of characters were read, then succeed
+		if (str || str.gcount() > 0)
+		{
+			*out_size = str.gcount();
+		}
+		else
+		{
+			// No characters read, so fail
+			free(out);
+			out = NULL;
+		}
+		str.close();
+
+	}
+	else
+	{
+		free(out);
+		out = NULL;
+	}
+
+	return out;
+}
+
+static int write_file_int(const void *data, size_t len, uint64_t timeout, const char *path)
+{
+	int fd;
+	fd_set wfds;
+	struct timeval tv;
+	int ret = 0;
+
+	tv.tv_sec = timeout / 1000;
+	tv.tv_usec = (timeout % 1000) * 10;
+
+	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+	if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
+	{
+		msleep(timeout);
+
+		fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+		if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
+			return -2;
+	}
+	if (fd < 0)
+		return fd;
+
+	FD_ZERO(&wfds);
+	FD_SET(fd, &wfds);
+
+	ret = select(fd + 1, NULL, &wfds, NULL, &tv);
+	if (ret == -1)
+	{
+		close(fd);
+
+		return ret;
+	}
+	else if (ret == 0)
+	{
+		// Timeout
+		close(fd);
+
+		return -2;
+	}
+
+	if (write(fd, data, len) != (int)len)
+		return -3;
+
+	close(fd);
+
+	return 0;
+}
+
+int write_file(const void *data, size_t len, const char *fmt, ...)
+{
+	char path[2048];
+	va_list ap;
+
+	/* Create the filename */
+	va_start(ap, fmt);
+	vsnprintf(path, 2048, fmt, ap);
+	va_end(ap);
+
+	if (mocked_write_callback)
+		return mocked_write_callback(data, len, path);
+
+	return write_file_int(data, len, 0, path);
+}
+
+
+std::string dir_concat(const std::string &dirIn, const std::string &filenameIn)
+{
+	if (dirIn == "")
+		return filenameIn;
+
+	std::string dir = dirIn;
+	std::string filename = filenameIn;
+
+	// Slash extra slashses
+	while (dir[dir.size() - 1] == '/')
+	{
+		dir = dir.substr(0, dir.size() - 1);
+	}
+
+	while (filename[0] == '/')
+	{
+		filename = filename.substr(1);
+	}
+
+	return dir + "/" + filename;
+}
+
+const char *get_home(void)
+{
+	return getenv("HOME");
+}
+
+bool file_readable(FILE *fp, unsigned int ms)
+{
+	fd_set rfds;
+	struct timeval tv;
+	int rv;
+
+	int fd = fileno(fp);
+
+	FD_ZERO(&rfds);
+	FD_SET(fd, &rfds);
+
+	tv.tv_sec = ms / 1000;
+	tv.tv_usec = (ms % 1000) * 1000;
+
+	rv = select(fd + 1, &rfds, NULL, NULL, &tv);
+
+	return rv > 0;
+}
+
+static std::unordered_map<std::string, bool> statCache;
+
+bool file_exists(const std::string &path)
+{
+	if (mocked_file_exists_callback)
+		return mocked_file_exists_callback(path);
+
+	bool out;
+
+	if (statCache.find(path) == statCache.end())
+	{
+		struct stat st;
+
+		out = lstat(path.c_str(), &st) == 0;
+
+		statCache[path] = out;
+	}
+	else
+	{
+		out = statCache[path];
+	}
+
+	return out;
+}
+
+bool executable_exists_in_path(const std::string &executableName)
+{
+	// Full path to it
+	if (file_exists(executableName))
+	{
+		return true;
+	}
+
+	std::string path = getenv("PATH");
+	std::vector<std::string> parts = split_string(path, ":");
+
+	for (std::vector<std::string>::iterator it = parts.begin();
+			it != parts.end();
+			++it)
+	{
+		std::string cur = fmt("%s/%s", it->c_str(), executableName.c_str());
+
+		if (file_exists(cur))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void mock_read_file(void *(*callback)(size_t *out_size, const char *path))
+{
+	mocked_read_callback = callback;
+}
+
+void mock_write_file(int (*callback)(const void *data, size_t size, const char *path))
+{
+	mocked_write_callback = callback;
+}
+
+void mock_file_exists(bool (*callback)(const std::string &path))
+{
+	mocked_file_exists_callback = callback;
+}
+
+
+void mock_get_file_timestamp(uint64_t (*callback)(const std::string &path))
+{
+	mocked_get_file_timestamp_callback = callback;
+}
+
+uint64_t get_file_timestamp(const std::string &path)
+{
+	if (mocked_get_file_timestamp_callback)
+		return mocked_get_file_timestamp_callback(path);
+
+	struct stat st;
+
+	// "Fail"
+	if (lstat(path.c_str(), &st) != 0)
+		return 0;
+
+	// See http://stackoverflow.com/questions/11373505/getting-the-last-modified-date-of-a-file-in-c
+#ifdef __APPLE__
+#ifndef st_mtim
+#define st_mtim st_mtimespec
+#endif
+#endif
+
+    return st.st_mtim.tv_sec;
+}
+
+static void read_write(FILE *dst, FILE *src)
+{
+	char buf[1024];
+
+	while (!feof(src))
+	{
+		int n = fread(buf, sizeof(char), sizeof(buf), src);
+
+		fwrite(buf, sizeof(char), n, dst);
+	}
+}
+
+int concat_files(const char *dst_name, const char *file_a, const char *file_b)
+{
+	FILE *dst;
+	FILE *s1, *s2;
+	int ret = -1;
+
+	dst = fopen(dst_name, "w");
+	if (!dst)
+		return -1;
+	s1 = fopen(file_a, "r");
+	if (!s1)
+		goto out_dst;
+	s2 = fopen(file_b, "r");
+	if (!s2)
+		goto out_s1;
+
+	read_write(dst, s1);
+	read_write(dst, s2);
+
+	fclose(s2);
+out_s1:
+	fclose(s1);
+out_dst:
+	fclose(dst);
+
+	return ret;
+}
+
+unsigned long get_aligned(unsigned long addr)
+{
+	return (addr / sizeof(long)) * sizeof(long);
+}
+
+unsigned long get_aligned_4b(unsigned long addr)
+{
+	return addr & ~3;
+}
+
+std::string fmt(const char *fmt, ...)
+{
+	char buf[4096];
+	va_list ap;
+	int res;
+
+	va_start(ap, fmt);
+	res = vsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
+
+	if (res >= (int)sizeof(buf))
+	{
+		std::string result;
+		result.resize(res+1);
+
+		va_start(ap, fmt);
+		res = vsnprintf(&result[0], result.size(), fmt, ap);
+		va_end(ap);
+
+		panic_if(res >= (int)result.size(),
+				"Buffer overflow");
+
+		result.resize(res);
+		return result;
+	}
+
+	return std::string(buf);
+}
+
+void mdelay(unsigned int ms)
+{
+	struct timespec ts;
+	ts.tv_sec = 0;
+	ts.tv_nsec = ms * 1000 * 1000;
+
+	nanosleep(&ts, NULL);
+}
+
+uint64_t get_ms_timestamp(void)
+{
+	static uint64_t first;
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+
+	if (first == 0)
+		first = (tv.tv_sec * 1000000ULL + tv.tv_usec) / 1000;
+
+	return ((tv.tv_sec * 1000000ULL + tv.tv_usec) / 1000) - first;
+}
+
+bool machine_is_64bit(void)
+{
+	return sizeof(unsigned long) == 8;
+}
+
+
+// http://stackoverflow.com/questions/236129/how-to-split-a-string-in-c
+static std::vector<std::string> &split(const std::string &s, char delim,
+		std::vector<std::string> &elems)
+{
+    std::stringstream ss(s);
+    std::string item;
+
+    while (std::getline(ss, item, delim))
+    {
+        elems.push_back(item);
+    }
+
+    return elems;
+}
+
+
+std::vector<std::string> split_string(const std::string &s, const char *delims)
+{
+    std::vector<std::string> elems;
+    split(s, *delims, elems);
+
+    return elems;
+}
+
+std::string trim_string(const std::string &strIn, const std::string &trimEndChars)
+{
+	std::string str = strIn;
+	size_t endpos = str.find_last_not_of(trimEndChars);
+
+	if (std::string::npos != endpos)
+		str = str.substr( 0, endpos+1 );
+
+	// trim leading spaces
+	size_t startpos = str.find_first_not_of(" \t");
+	if (std::string::npos != startpos)
+		str = str.substr( startpos );
+	else
+		str = "";
+
+	return str;
+}
+
+// Cache for ::realpath - it's apparently one of the reasons why kcov is slow
+typedef std::unordered_map<std::string, std::string> PathMap_t;
+static PathMap_t realPathCache;
+const std::string &get_real_path(const std::string &path)
+{
+	PathMap_t::const_iterator it = realPathCache.find(path);
+	if (it != realPathCache.end())
+		return it->second;
+
+	char *rp = NULL;
+
+	rp = ::realpath(path.c_str(), NULL);
+
+	if (!rp)
+		return path;
+
+	realPathCache[path] = rp;
+	free(rp);
+
+	return realPathCache[path];
+}
+
+
+bool string_is_integer(const std::string &str, unsigned base)
+{
+	size_t pos;
+
+	try
+	{
+		stoull(str, &pos, base);
+	}
+	catch(std::invalid_argument &e)
+	{
+		return false;
+	}
+	catch(std::out_of_range &e)
+	{
+		return false;
+	}
+
+	return pos == str.size();
+}
+
+int64_t string_to_integer(const std::string &str, unsigned base)
+{
+	size_t pos;
+
+	return (int64_t)stoull(str, &pos, base);
+}
+
+
+
+static char *escape_helper(char *dst, const char *what)
+{
+	int len = strlen(what);
+
+	strcpy(dst, what);
+
+	return dst + len;
+}
+
+std::string escape_html(const std::string &str)
+{
+	const char *s = str.c_str();
+	char buf[4096];
+	char *dst = buf;
+	size_t len = strlen(s);
+	bool truncated = false;
+	size_t i;
+
+	// Truncate long lines (or entries)
+	if (len > 512)
+	{
+		len = 512;
+		truncated = true;
+	}
+
+	memset(buf, 0, sizeof(buf));
+	for (i = 0; i < len; i++)
+	{
+		char c = s[i];
+
+		switch (c)
+		{
+		case '<':
+			dst = escape_helper(dst, "&lt;");
+			break;
+		case '>':
+			dst = escape_helper(dst, "&gt;");
+			break;
+		case '&':
+			dst = escape_helper(dst, "&amp;");
+			break;
+		case '\"':
+			dst = escape_helper(dst, "&quot;");
+			break;
+		case '\'':
+			dst = escape_helper(dst, "&#039;");
+			break;
+		case '/':
+			dst = escape_helper(dst, "&#047;");
+			break;
+		case '\\':
+			dst = escape_helper(dst, "&#092;");
+			break;
+		case '\n': case '\r':
+			dst = escape_helper(dst, " ");
+			break;
+		default:
+			*dst = c;
+			dst++;
+			break;
+		}
+	}
+
+	if (truncated)
+		return std::string(buf) + "...";
+
+	return std::string(buf);
+}
+
+std::string escape_json(const std::string &str)
+{
+	const std::string escapeChars = "\"\\\t\015'";
+	size_t n_escapes = 0;
+
+	for (unsigned i = 0; i < str.size(); i++)
+	{
+		for (unsigned int n = 0; n < escapeChars.size(); n++)
+		{
+			if (str[i] == escapeChars[n])
+				n_escapes++;
+		}
+	}
+
+	if (n_escapes == 0)
+		return str;
+
+	std::string out;
+	out.resize(str.size() + n_escapes);
+	unsigned cur = 0;
+
+	for (unsigned i = 0; i < str.size(); i++)
+	{
+		out[cur] = str[i];
+
+		// Special-case tabs
+		if (str[i] == '\t')
+		{
+			out[cur] = '\\';
+			cur++;
+			out[cur] = 't';
+			cur++;
+			continue;
+		}
+		// Quote quotes and backslashes
+		for (unsigned int n = 0; n < escapeChars.size(); n++)
+		{
+			if (str[i] == escapeChars[n])
+			{
+				out[cur] = '\\';
+				cur++;
+				out[cur] = str[i];
+			}
+		}
+		cur++;
+	}
+
+	return out;
+}
+
+std::pair<std::string, std::string> split_path(const std::string &pathStr)
+{
+	std::pair<std::string, std::string> out;
+	std::string path(pathStr);
+
+	size_t pos = path.rfind('/');
+
+	out.first = "";
+	out.second = path;
+	if (pos != std::string::npos)
+	{
+		out.first= path.substr(0, pos + 1);
+		out.second = path.substr(pos + 1, std::string::npos);
+	}
+
+	return out;
+}
diff --git a/kcov-38/src/writers/cobertura-writer.cc b/kcov-38/src/writers/cobertura-writer.cc
new file mode 100644
index 000000000000..3682bdd1b491
--- /dev/null
+++ b/kcov-38/src/writers/cobertura-writer.cc
@@ -0,0 +1,206 @@
+namespace std
+{
+class type_info;
+}
+
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <configuration.hh>
+#include <writer.hh>
+#include <utils.hh>
+
+#include <string>
+#include <list>
+#include <vector>
+#include <unordered_map>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "writer-base.hh"
+
+using namespace kcov;
+
+class CoberturaWriter : public WriterBase
+{
+public:
+	CoberturaWriter(IFileParser &parser, IReporter &reporter, const std::string &outDir) :
+			WriterBase(parser, reporter), m_maxPossibleHits(parser.maxPossibleHits())
+	{
+		m_outFiles.push_back(outDir + "/cobertura.xml");
+		m_outFiles.push_back(outDir + "/cov.xml"); // For vscode coverage gutters
+	}
+
+	void onStartup()
+	{
+	}
+
+	void onStop()
+	{
+	}
+
+	void write()
+	{
+		std::stringstream out;
+
+		unsigned int nTotalExecutedLines = 0;
+		unsigned int nTotalCodeLines = 0;
+
+		setupCommonPaths();
+
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *file = it->second;
+
+			// Fixup file->m_codeLines etc
+			sumOne(file);
+
+			nTotalCodeLines += file->m_codeLines;
+			nTotalExecutedLines += file->m_executedLines;
+		}
+		out << getHeader(nTotalCodeLines, nTotalExecutedLines);
+
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *file = it->second;
+
+			out << writeOne(file);
+		}
+
+		out << getFooter();
+		for (std::vector<std::string>::iterator it = m_outFiles.begin();
+			it != m_outFiles.end();
+			++it)
+		{
+			std::ofstream cur(*it);
+			cur << out.str();
+		}
+	}
+
+private:
+	const std::string mangleFileName(const std::string &name)
+	{
+		std::string out = name;
+
+		for (size_t pos = 0; pos < name.size(); pos++)
+		{
+			if (out[pos] == '.' || out[pos] == '-')
+				out[pos] = '_';
+		}
+
+		return out;
+	}
+
+	void sumOne(File *file)
+	{
+		unsigned int nExecutedLines = 0;
+		unsigned int nCodeLines = 0;
+
+		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+		{
+			if (!m_reporter.lineIsCode(file->m_name, n))
+				continue;
+
+			IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
+
+			nExecutedLines += !!cnt.m_hits;
+			nCodeLines++;
+
+			unsigned int hits = cnt.m_hits;
+
+			if (hits && m_maxPossibleHits == IFileParser::HITS_SINGLE)
+				hits = 1;
+
+			// Update the execution count
+			file->m_executedLines = nExecutedLines;
+			file->m_codeLines = nCodeLines;
+		}
+	}
+
+	std::string writeOne(File *file)
+	{
+		std::string out;
+
+		std::string mangledName = mangleFileName(file->m_fileName);
+
+		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+		{
+			if (!m_reporter.lineIsCode(file->m_name, n))
+				continue;
+
+			IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
+
+			unsigned int hits = cnt.m_hits;
+
+			if (hits && m_maxPossibleHits == IFileParser::HITS_SINGLE)
+				hits = 1;
+
+			out = out + "						<line number=\"" + fmt("%u", n) + "\" hits=\"" + fmt("%u", hits) + "\"/>\n";
+		}
+
+		unsigned nCodeLines = file->m_codeLines;
+		if (nCodeLines == 0)
+			nCodeLines = 1;
+
+		std::string filename = file->m_name;
+		size_t pos = filename.find(m_commonPath);
+
+		if (pos != std::string::npos && filename.size() > m_commonPath.size())
+			filename = filename.substr(m_commonPath.size() + 1);
+
+		out = "				<class name=\"" + mangledName + "\" filename=\"" + filename + "\" branch-rate=\"1.0\" complexity=\"1.0\" line-rate=\""
+				+ fmt("%.3f", file->m_executedLines / (float) nCodeLines) + "\">\n" + "					<lines>\n" + out + "					</lines>\n"
+						"				</class>\n";
+
+		return out;
+	}
+
+	std::string getHeader(unsigned int nCodeLines, unsigned int nExecutedLines)
+	{
+		time_t t;
+		struct tm *tm;
+		char date_buf[80];
+
+		t = time(NULL);
+		tm = localtime(&t);
+		strftime(date_buf, sizeof(date_buf), "%s", tm);
+
+		std::string linesCovered = fmt("%u", nExecutedLines);
+		std::string linesValid = fmt("%u", nCodeLines);
+
+		if (nCodeLines == 0)
+			nCodeLines = 1;
+
+		std::string lineRate = fmt("%.3f", nExecutedLines / (float) nCodeLines);
+
+		return "<?xml version=\"1.0\" ?>\n"
+				"<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>\n"
+				"<coverage line-rate=\"" + lineRate + "\" lines-covered=\"" + linesCovered + "\" lines-valid=\"" + linesValid + "\" branch-rate=\"1.0\" branches-covered=\"1.0\" branches-rate=\"1.0\" complexity=\"1.0\" version=\"1.9\" timestamp=\"" + std::string(date_buf) + "\">\n"
+				"	<sources>\n"
+				"		<source>" + m_commonPath + "/</source>\n"
+				"	</sources>\n"
+				"	<packages>\n"
+				"		<package name=\"" + mangleFileName(IConfiguration::getInstance().keyAsString("command-name"))
+				+ "\" line-rate=\"" + lineRate + "\" lines-covered=\"" + linesCovered + "\" lines-valid=\"" + linesValid + "\" branch-rate=\"1.0\" complexity=\"1.0\">\n"
+						"			<classes>\n";
+	}
+
+	const std::string getFooter()
+	{
+		return "			</classes>\n"
+				"		</package>\n"
+				"	</packages>\n"
+				"</coverage>\n";
+	}
+
+	std::vector<std::string> m_outFiles;
+	IFileParser::PossibleHits m_maxPossibleHits;
+};
+
+namespace kcov
+{
+	IWriter &createCoberturaWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile)
+	{
+		return *new CoberturaWriter(parser, reporter, outFile);
+	}
+}
diff --git a/kcov-38/src/writers/cobertura-writer.hh b/kcov-38/src/writers/cobertura-writer.hh
new file mode 100644
index 000000000000..af2259bf1c56
--- /dev/null
+++ b/kcov-38/src/writers/cobertura-writer.hh
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+	class IOutputHandler;
+
+	IWriter &createCoberturaWriter(IFileParser &elf, IReporter &reporter,
+			const std::string &outDirectory);
+}
diff --git a/kcov-38/src/writers/coveralls-writer.cc b/kcov-38/src/writers/coveralls-writer.cc
new file mode 100644
index 000000000000..aad5ca5d4e0d
--- /dev/null
+++ b/kcov-38/src/writers/coveralls-writer.cc
@@ -0,0 +1,248 @@
+/*
+ * Writer for the "coveralls.io" web service.
+ */
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <configuration.hh>
+#include <writer.hh>
+#include <utils.hh>
+
+#include <string>
+#include <list>
+#include <unordered_map>
+#include <iostream>
+#include <fstream>
+
+#include <curl/curl.h>
+#include <string.h>
+
+#include "writer-base.hh"
+
+using namespace kcov;
+
+class CurlConnectionHandler
+{
+public:
+	CurlConnectionHandler() :
+		m_headerlist(NULL)
+	{
+		static const char buf[] = "Expect:";
+
+		// Workaround proxy problems
+		m_headerlist = curl_slist_append(m_headerlist, buf);
+
+		curl_global_init(CURL_GLOBAL_ALL);
+
+		m_curl = curl_easy_init();
+
+		// Setup curl to read from memory
+		curl_easy_setopt(m_curl, CURLOPT_URL, "https://coveralls.io/api/v1/jobs");
+		curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteFuncStatic);
+		curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, (void *)this);
+		curl_easy_setopt(m_curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
+		curl_easy_setopt(m_curl, CURLOPT_HTTPHEADER, m_headerlist); // Proxy issues
+	}
+
+	~CurlConnectionHandler()
+	{
+		curl_slist_free_all(m_headerlist);
+		curl_easy_cleanup(m_curl);
+		curl_global_cleanup();
+	}
+
+
+	// Send fileName and data to the remote server
+	bool talk(const std::string &fileName)
+	{
+		m_writtenData = "";
+
+		struct curl_httppost *formpost = NULL;
+		struct curl_httppost *lastptr = NULL;
+		CURLcode res;
+
+		curl_formadd(&formpost,
+				&lastptr,
+				CURLFORM_COPYNAME, "json_file",
+				CURLFORM_FILE, fileName.c_str(),
+				CURLFORM_END);
+
+		curl_easy_setopt(m_curl, CURLOPT_HTTPPOST, formpost);
+
+		res = curl_easy_perform(m_curl);
+
+		curl_formfree(formpost);
+
+		if (res != CURLE_OK)
+			return false;
+
+		if (m_writtenData.find("Job #") == std::string::npos)
+		{
+			warning("coveralls write failed: %s\n", m_writtenData.c_str());
+			return false;
+		}
+
+		return true;
+	}
+
+private:
+	size_t curlWritefunc(void *ptr, size_t size, size_t nmemb)
+	{
+		const char *p = (char *)ptr;
+
+		m_writtenData.append(p, size * nmemb);
+
+		return size * nmemb;
+	}
+
+	static size_t curlWriteFuncStatic(void *ptr, size_t size, size_t nmemb, void *priv)
+	{
+		if (!priv)
+			return 0;
+
+		return ((CurlConnectionHandler *)priv)->curlWritefunc(ptr, size, nmemb);
+	}
+
+	CURL *m_curl;
+	std::string m_writtenData;
+	struct curl_slist *m_headerlist;
+};
+
+static CurlConnectionHandler *g_curl;
+
+
+class CoverallsWriter : public WriterBase
+{
+public:
+	CoverallsWriter(IFileParser &parser, IReporter &reporter) :
+		WriterBase(parser, reporter),
+		m_doWrite(false)
+	{
+	}
+
+	void onStartup()
+	{
+	}
+
+	void onStop()
+	{
+		m_doWrite = true;
+	}
+
+	void write()
+	{
+		// Write once at the end only
+		if (!m_doWrite)
+			return;
+
+		IConfiguration &conf = IConfiguration::getInstance();
+		const std::string &id = conf.keyAsString("coveralls-id");
+
+		// No token? Skip output then
+		if (id == "")
+			return;
+
+		std::string outFile = conf.keyAsString("target-directory") + "/coveralls.out";
+
+		// Output file with coveralls json data
+		std::ofstream out(outFile);
+
+		// Output directory not writable?
+		if (!out.is_open())
+			return;
+
+		out << "{\n";
+		if (isRepoToken(id))
+		{
+			out << " \"repo_token\": \"" + id + "\",\n";
+		}
+		else
+		{
+			out << " \"service_name\": \"" + conf.keyAsString("coveralls-service-name") + "\",\n";
+			out << " \"service_job_id\": \"" + id + "\",\n";
+		}
+		out << " \"source_files\": [\n";
+		setupCommonPaths();
+		
+		std::string strip_path = conf.keyAsString("strip-path");
+		if (strip_path.size() == 0)
+		{
+			setupCommonPaths();
+			strip_path = m_commonPath + "/";
+		}
+
+		unsigned int filesLeft = m_files.size();
+		for (FileMap_t::const_iterator it = m_files.begin();
+				it != m_files.end();
+				++it)
+		{
+			File *file = it->second;
+			std::string fileName;
+
+			// Strip away the specified path (unless this is the only file)
+			if (file->m_name.compare(0, strip_path.length(), strip_path) == 0)
+				fileName = file->m_name.substr(strip_path.size());
+			else
+				fileName = file->m_fileName;
+
+			out << "  {\n";
+			out << "   \"name\": \"" + escape_json(fileName) + "\",\n";
+			// Use hash as source file
+			out << fmt("   \"source_digest\": \"0x%08lx\",\n", (unsigned long)file->m_crc);
+			out << "   \"coverage\": [";
+
+			// And coverage
+			for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+			{
+				if (!m_reporter.lineIsCode(file->m_name, n))
+				{
+					out << "null";
+				}
+				else
+				{
+					IReporter::LineExecutionCount cnt =
+							m_reporter.getLineExecutionCount(file->m_name, n);
+
+					out << cnt.m_hits;
+				}
+
+				if (n != file->m_lastLineNr - 1)
+					out << ",";
+			}
+			out << "]\n";
+
+			// Add comma or not on the last run
+			filesLeft--;
+			if (filesLeft > 0)
+				out << "  },\n";
+			else
+				out << "  }\n";
+		}
+		out << " ]\n";
+		out << "}\n";
+
+		out.close();
+
+		// Create singleton
+		if (!g_curl)
+			g_curl = new CurlConnectionHandler();
+
+		if (id != "dry-run")
+			g_curl->talk(outFile);
+	}
+
+private:
+	bool isRepoToken(const std::string &str)
+	{
+		return str.size() >= 32;
+	}
+
+	bool m_doWrite;
+};
+
+namespace kcov
+{
+	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter)
+	{
+		return *new CoverallsWriter(parser, reporter);
+	}
+}
diff --git a/kcov-38/src/writers/coveralls-writer.hh b/kcov-38/src/writers/coveralls-writer.hh
new file mode 100644
index 000000000000..67ef9dca33e4
--- /dev/null
+++ b/kcov-38/src/writers/coveralls-writer.hh
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+
+	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter);
+}
diff --git a/kcov-38/src/writers/dummy-coveralls-writer.cc b/kcov-38/src/writers/dummy-coveralls-writer.cc
new file mode 100644
index 000000000000..8c458d36556d
--- /dev/null
+++ b/kcov-38/src/writers/dummy-coveralls-writer.cc
@@ -0,0 +1,29 @@
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <writer.hh>
+
+#include "writer-base.hh"
+
+class DummyCoverallsWriter : public kcov::IWriter
+{
+public:
+	void onStartup()
+	{
+	}
+
+	void onStop()
+	{
+	}
+
+	void write()
+	{
+	}
+};
+
+namespace kcov
+{
+	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter)
+	{
+		return *new DummyCoverallsWriter();
+	}
+}
diff --git a/kcov-38/src/writers/html-writer.cc b/kcov-38/src/writers/html-writer.cc
new file mode 100644
index 000000000000..56e3d3cab50b
--- /dev/null
+++ b/kcov-38/src/writers/html-writer.cc
@@ -0,0 +1,413 @@
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <configuration.hh>
+#include <writer.hh>
+#include <utils.hh>
+#include <generated-data-base.hh>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <string>
+#include <list>
+#include <vector>
+#include <unordered_map>
+#include <fstream>
+
+#include "writer-base.hh"
+
+using namespace kcov;
+
+// Generated
+extern GeneratedData css_text_data;
+extern GeneratedData icon_amber_data;
+extern GeneratedData icon_glass_data;
+extern GeneratedData source_file_text_data;
+extern GeneratedData index_text_data;
+extern GeneratedData handlebars_text_data;
+extern GeneratedData kcov_text_data;
+extern GeneratedData jquery_text_data;
+extern GeneratedData tablesorter_text_data;
+extern GeneratedData tablesorter_widgets_text_data;
+extern GeneratedData tablesorter_theme_text_data;
+
+class HtmlWriter : public WriterBase
+{
+public:
+	HtmlWriter(IFileParser &parser, IReporter &reporter, const std::string &indexDirectory, const std::string &outDirectory,
+			const std::string &name, bool includeInTotals) :
+			WriterBase(parser, reporter), m_outDirectory(outDirectory + "/"), m_indexDirectory(indexDirectory + "/"), m_summaryDbFileName(
+					outDirectory + "/summary.db"), m_name(name), m_includeInTotals(includeInTotals), m_maxPossibleHits(
+					parser.maxPossibleHits())
+	{
+	}
+
+	void onStop()
+	{
+	}
+
+private:
+
+	void writeOne(File *file)
+	{
+		std::string jsonOutName = m_outDirectory + "/" + file->m_jsonOutFileName;
+		std::string htmlOutName = m_outDirectory + "/" + file->m_outFileName;
+		unsigned int nExecutedLines = 0;
+		unsigned int nCodeLines = 0;
+
+		// Out-file for JSON data
+		std::ofstream outJson(jsonOutName);
+		// ... and HTML data
+		std::ofstream outHtml(htmlOutName);
+
+		outJson << "var data = {lines:[\n";
+
+		// Produce each line in the file
+		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+		{
+			const std::string &line = file->m_lineMap[n];
+
+			outJson << fmt("{\"lineNum\":\"%5u\","
+					"\"line\":\"", n);
+			outJson << escape_json(line) << "\"";
+
+			if (m_reporter.lineIsCode(file->m_name, n))
+			{
+				IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
+				std::string lineClass = "lineNoCov";
+
+				if (m_maxPossibleHits == IFileParser::HITS_UNLIMITED || m_maxPossibleHits == IFileParser::HITS_SINGLE)
+				{
+					if (cnt.m_hits)
+						lineClass = "lineCov";
+				}
+				else
+				{ // One or multiple for a line
+					if (cnt.m_hits == cnt.m_possibleHits)
+						lineClass = "lineCov";
+					else if (cnt.m_hits)
+						lineClass = "linePartCov";
+				}
+
+				outJson << fmt(",\"class\":\"%s\","
+						"\"hits\":\"%u\",", lineClass.c_str(), cnt.m_hits);
+
+				// Don't report order for zeroes
+				if (cnt.m_order)
+					outJson << fmt("\"order\":\"%llu\",", (unsigned long long) cnt.m_order);
+
+				if (m_maxPossibleHits != IFileParser::HITS_SINGLE)
+					outJson << fmt("\"possible_hits\":\"%u\",", cnt.m_possibleHits);
+
+				nExecutedLines += !!cnt.m_hits;
+				nCodeLines++;
+			}
+			outJson << "},\n";
+
+			// Update the execution count
+			file->m_executedLines = nExecutedLines;
+			file->m_codeLines = nCodeLines;
+		}
+
+		// Add the header
+		outJson << "]};\n";
+		outJson << getHeader(nCodeLines, nExecutedLines);
+		outJson << "var merged_data = [];\n";
+
+		// Produce HTML out-file
+		outHtml << fmt("<script type=\"text/javascript\" src=\"%s\"></script>\n", file->m_jsonOutFileName.c_str());
+		outHtml.write((const char *) source_file_text_data.data(), source_file_text_data.size());
+	}
+
+	void writeIndex()
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		unsigned int nTotalExecutedLines = 0;
+		unsigned int nTotalCodeLines = 0;
+
+		// Out-file for JSON data
+		std::ofstream outJson(m_outDirectory + "index.js");
+		outJson << "var data = {files:[\n"; // Not really json, but anyway
+
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *file = it->second;
+			unsigned int nExecutedLines = file->m_executedLines;
+			unsigned int nCodeLines = file->m_codeLines;
+
+			nTotalCodeLines += nCodeLines;
+			nTotalExecutedLines += nExecutedLines;
+
+			std::string listName = file->m_name;
+
+			size_t pos = listName.find(m_commonPath);
+			unsigned int stripLevel = IConfiguration::getInstance().keyAsInt("path-strip-level");
+
+			if (pos != std::string::npos && m_commonPath.size() != 0 && stripLevel != ~0U)
+			{
+				std::string pathToRemove = m_commonPath;
+
+				for (unsigned int i = 0; i < stripLevel; i++)
+				{
+					size_t slashPos = pathToRemove.rfind("/");
+
+					if (slashPos == std::string::npos)
+						break;
+					pathToRemove = pathToRemove.substr(0, slashPos);
+				}
+
+				std::string prefix = "[...]";
+
+				if (pathToRemove == "")
+					prefix = "";
+				listName = prefix + listName.substr(pathToRemove.size());
+			}
+
+			outJson << getIndexHeader(file->m_outFileName, file->m_fileName, listName, nCodeLines, nExecutedLines);
+		}
+
+		// Add the header
+		outJson
+				<< fmt("]};\n"
+						"var percent_low = %d;"
+						"var percent_high = %d;"
+						"\n"
+						"var header = {"
+						" \"command\" : \"%s\","
+						" \"date\" : \"%s\","
+						" \"instrumented\" : %d,"
+						" \"covered\" : %d,"
+						"};"
+						"\n", conf.keyAsInt("low-limit"), conf.keyAsInt("high-limit"),
+						escape_json(conf.keyAsString("command-name")).c_str(), getDateNow().c_str(), nTotalCodeLines,
+						nTotalExecutedLines) + "var merged_data = [];\n";
+
+		// Produce HTML outfile
+		std::ofstream outHtml(m_outDirectory + "index.html");
+		outHtml.write((const char *) index_text_data.data(), index_text_data.size());
+
+		// Produce a summary
+		IReporter::ExecutionSummary summary = m_reporter.getExecutionSummary();
+		summary.m_includeInTotals = m_includeInTotals;
+		size_t sz;
+
+		void *data = marshalSummary(summary, m_name, &sz);
+
+		if (data)
+			write_file(data, sz, "%s", m_summaryDbFileName.c_str());
+
+		free(data);
+	}
+
+	void writeGlobalIndex()
+	{
+		DIR *dir;
+		struct dirent *de;
+		std::string idx = m_indexDirectory.c_str();
+		std::string s;
+		unsigned int nTotalExecutedLines = 0;
+		unsigned int nTotalCodeLines = 0;
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		dir = opendir(idx.c_str());
+		panic_if(!dir, "Can't open directory %s\n", idx.c_str());
+
+		std::ofstream outJson(m_indexDirectory + "index.js");
+
+		outJson << "var data = {files:[\n";
+		std::string merged;
+
+		for (de = readdir(dir); de; de = readdir(dir))
+		{
+			std::string curDir = idx + de->d_name;
+			std::string cur = curDir + "/summary.db";
+			struct stat st;
+
+			if (lstat(curDir.c_str(), &st) < 0)
+			{
+				continue;
+			}
+
+			if (S_ISLNK(st.st_mode))
+			{
+				// Skip human friendly names
+				continue;
+			}
+
+			if (!file_exists(cur))
+				continue;
+
+			size_t sz;
+			void *data = read_file(&sz, "%s", cur.c_str());
+
+			if (!data)
+				continue;
+
+			IReporter::ExecutionSummary summary;
+			std::string name;
+			bool res = unMarshalSummary(data, sz, summary, name);
+			free(data);
+
+			if (!res)
+				continue;
+
+			// Skip entries (merged ones) that shouldn't be included in the totals
+			if (summary.m_includeInTotals)
+			{
+				nTotalCodeLines += summary.m_lines;
+				nTotalExecutedLines += summary.m_executedLines;
+			}
+
+			std::string datum = getIndexHeader(fmt("%s/index.html", de->d_name), name, name, summary.m_lines,
+					summary.m_executedLines);
+
+			if (name == conf.keyAsString("merged-name"))
+				merged += datum;
+			else
+				outJson << datum;
+		}
+
+		// Add the header
+		outJson << "], merged_files:[" + merged + "]};\n" + getHeader(nTotalCodeLines, nTotalExecutedLines);
+
+		// Produce HTML outfile
+		std::ofstream outHtml(m_indexDirectory + "index.html");
+		outHtml.write((const char *) index_text_data.data(), index_text_data.size());
+
+		closedir(dir);
+	}
+
+	void write()
+	{
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+			writeOne(it->second);
+
+		setupCommonPaths();
+
+		writeIndex();
+
+		if (m_includeInTotals)
+			writeGlobalIndex();
+	}
+
+	std::string getHeader(unsigned int lines, unsigned int executedLines)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		return fmt("var percent_low = %d;"
+				"var percent_high = %d;"
+				"\n"
+				"var header = {"
+				" \"command\" : \"%s\","
+				" \"date\" : \"%s\","
+				" \"instrumented\" : %d,"
+				" \"covered\" : %d,"
+				"};"
+				"\n", conf.keyAsInt("low-limit"), conf.keyAsInt("high-limit"),
+				escape_json(conf.keyAsString("command-name")).c_str(), getDateNow().c_str(), lines, executedLines);
+	}
+
+	// Return a header for index-type JSON files
+	std::string getIndexHeader(const std::string &linkName, const std::string titleName, const std::string summaryName,
+			unsigned int lines, unsigned int executedLines)
+	{
+		double percent = 0;
+
+		if (lines != 0)
+			percent = (executedLines / (double) lines) * 100;
+
+		return fmt("{\"link\":\"%s\","
+				"\"title\":\"%s\","
+				"\"summary_name\":\"%s\","
+				"\"covered_class\":\"%s\","
+				"\"covered\":\"%.1f\","
+				"\"covered_lines\":\"%d\","
+				"\"uncovered_lines\":\"%d\","
+				"\"total_lines\" : \"%d\"},\n", linkName.c_str(), titleName.c_str(), summaryName.c_str(),
+				colorFromPercent(percent).c_str(), percent, executedLines, lines - executedLines, lines);
+	}
+
+	std::string colorFromPercent(double percent)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+
+		if (percent >= conf.keyAsInt("high-limit"))
+			return "lineCov";
+		else if (percent > conf.keyAsInt("low-limit"))
+			return "linePartCov";
+
+		return "lineNoCov";
+	}
+
+	std::string getDateNow()
+	{
+		time_t t;
+		struct tm *tm;
+		char date_buf[128];
+
+		t = time(NULL);
+		tm = localtime(&t);
+		strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", tm);
+
+		return std::string(date_buf);
+	}
+
+	void writeHelperFiles(std::string dir)
+	{
+		IConfiguration &conf = IConfiguration::getInstance();
+		GeneratedData css = css_text_data;
+
+		std::string cssFileName = conf.keyAsString("css-file");
+		if (cssFileName != "")
+		{
+			size_t sz;
+			uint8_t *p = (uint8_t *) read_file(&sz, "%s", cssFileName.c_str());
+
+			if (p)
+				css = GeneratedData(p, sz);
+			else
+				warning("Can't read CSS file %s\n", cssFileName.c_str());
+		}
+
+		write_file(icon_amber_data.data(), icon_amber_data.size(), "%s/amber.png", dir.c_str());
+		write_file(icon_glass_data.data(), icon_glass_data.size(), "%s/glass.png", dir.c_str());
+		write_file(css.data(), css.size(), "%s/bcov.css", dir.c_str());
+
+		(void) mkdir(fmt("%s/data", dir.c_str()).c_str(), 0755);
+		(void) mkdir(fmt("%s/data/js", dir.c_str()).c_str(), 0755);
+		write_file(icon_amber_data.data(), icon_amber_data.size(), "%s/data/amber.png", dir.c_str());
+		write_file(icon_glass_data.data(), icon_glass_data.size(), "%s/data/glass.png", dir.c_str());
+		write_file(css.data(), css.size(), "%s/data/bcov.css", dir.c_str());
+		write_file(handlebars_text_data.data(), handlebars_text_data.size(), "%s/data/js/handlebars.js", dir.c_str());
+		write_file(kcov_text_data.data(), kcov_text_data.size(), "%s/data/js/kcov.js", dir.c_str());
+		write_file(jquery_text_data.data(), jquery_text_data.size(), "%s/data/js/jquery.min.js", dir.c_str());
+		write_file(tablesorter_text_data.data(), tablesorter_text_data.size(), "%s/data/js/tablesorter.min.js", dir.c_str());
+		write_file(tablesorter_widgets_text_data.data(), tablesorter_widgets_text_data.size(),
+				"%s/data/js/jquery.tablesorter.widgets.min.js", dir.c_str());
+		write_file(tablesorter_theme_text_data.data(), tablesorter_theme_text_data.size(), "%s/data/tablesorter-theme.css",
+				dir.c_str());
+	}
+
+	void onStartup()
+	{
+		writeHelperFiles(m_indexDirectory);
+		writeHelperFiles(m_outDirectory);
+	}
+
+	std::string m_outDirectory;
+	std::string m_indexDirectory;
+	std::string m_summaryDbFileName;
+	std::string m_name;
+	bool m_includeInTotals;
+	enum IFileParser::PossibleHits m_maxPossibleHits;
+};
+
+namespace kcov
+{
+	IWriter &createHtmlWriter(IFileParser &parser, IReporter &reporter, const std::string &indexDirectory,
+			const std::string &outDirectory, const std::string &name, bool includeInTotals)
+	{
+		return *new HtmlWriter(parser, reporter, indexDirectory, outDirectory, name, includeInTotals);
+	}
+}
diff --git a/kcov-38/src/writers/html-writer.hh b/kcov-38/src/writers/html-writer.hh
new file mode 100644
index 000000000000..69b546bb1e4d
--- /dev/null
+++ b/kcov-38/src/writers/html-writer.hh
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+	class IOutputHandler;
+
+	IWriter &createHtmlWriter(IFileParser &elf, IReporter &reporter,
+			const std::string &indexDirectory,
+			const std::string &outDirectory,
+			const std::string &name,
+			bool includeInTotals = true);
+}
diff --git a/kcov-38/src/writers/json-writer.cc b/kcov-38/src/writers/json-writer.cc
new file mode 100644
index 000000000000..d0d124d4120f
--- /dev/null
+++ b/kcov-38/src/writers/json-writer.cc
@@ -0,0 +1,131 @@
+namespace std
+{
+class type_info;
+}
+
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <configuration.hh>
+#include <writer.hh>
+#include <utils.hh>
+
+#include <string>
+#include <list>
+#include <unordered_map>
+#include <iostream>
+#include <fstream>
+
+#include "writer-base.hh"
+
+using namespace kcov;
+
+class JsonWriter : public WriterBase
+{
+public:
+	JsonWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile) :
+			WriterBase(parser, reporter), m_outFile(outFile)
+	{
+	}
+
+	void onStartup()
+	{
+	}
+
+	void onStop()
+	{
+	}
+
+	void write()
+	{
+		std::ofstream out(m_outFile);
+
+		// Output directory not writable?
+		if (!out.is_open())
+			return;
+
+		out << "{\n";
+		out << "  \"files\": [\n";
+
+		IConfiguration &conf = IConfiguration::getInstance();
+		unsigned int nTotalExecutedLines = 0;
+		unsigned int nTotalCodeLines = 0;
+		double percentCovered = 0.0;
+		bool firstFile = true;
+
+		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+		{
+			File *file = it->second;
+			unsigned int nExecutedLines = 0;
+			unsigned int nCodeLines = 0;
+
+			for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+			{
+				IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
+				if (m_reporter.lineIsCode(file->m_name, n))
+				{
+					nExecutedLines += !!cnt.m_hits;
+					nCodeLines++;
+					nTotalExecutedLines += !!cnt.m_hits;
+					nTotalCodeLines++;
+				}
+			}
+			if (nCodeLines > 0)
+				percentCovered = static_cast<double>(nExecutedLines) / nCodeLines * 100;
+
+			if (firstFile)
+				firstFile = false;
+			else
+				out << ",\n";
+
+			out << fmt("    {"
+					"\"file\": \"%s\", "
+					"\"percent_covered\": \"%.2f\", "
+					"\"covered_lines\": \"%d\", "
+					"\"total_lines\": \"%d\""
+					"}", file->m_name.c_str(), percentCovered, nExecutedLines, nCodeLines);
+		}
+
+		percentCovered = 0;
+		if (nTotalCodeLines > 0)
+			percentCovered = static_cast<double>(nTotalExecutedLines) / nTotalCodeLines * 100;
+
+		out
+				<< fmt("\n"
+						"  ],\n"
+						"  \"percent_covered\": \"%.2f\",\n"
+						"  \"covered_lines\": %d,\n"
+						"  \"total_lines\": %d,\n"
+						"  \"percent_low\": %d,\n"
+						"  \"percent_high\": %d,\n"
+						"  \"command\": \"%s\",\n"
+						"  \"date\": \"%s\"\n"
+						"}\n", percentCovered, nTotalExecutedLines, nTotalCodeLines, conf.keyAsInt("low-limit"),
+						conf.keyAsInt("high-limit"), escape_json(conf.keyAsString("command-name")).c_str(),
+						getDateNow().c_str());
+
+	}
+
+private:
+	std::string getDateNow()
+	{
+		time_t t;
+		struct tm *tm;
+		char date_buf[128];
+
+		t = time(NULL);
+		tm = localtime(&t);
+		strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", tm);
+
+		return std::string(date_buf);
+	}
+
+	std::string m_outFile;
+};
+
+namespace kcov
+{
+	IWriter &createJsonWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile)
+	{
+		return *new JsonWriter(parser, reporter, outFile);
+	}
+}
diff --git a/kcov-38/src/writers/json-writer.hh b/kcov-38/src/writers/json-writer.hh
new file mode 100644
index 000000000000..889081cb1a7e
--- /dev/null
+++ b/kcov-38/src/writers/json-writer.hh
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+	class IOutputHandler;
+
+	IWriter &createJsonWriter(IFileParser &elf, IReporter &reporter,
+			const std::string &outFile);
+}
diff --git a/kcov-38/src/writers/sonarqube-xml-writer.cc b/kcov-38/src/writers/sonarqube-xml-writer.cc
new file mode 100644
index 000000000000..7b34233bcdd3
--- /dev/null
+++ b/kcov-38/src/writers/sonarqube-xml-writer.cc
@@ -0,0 +1,106 @@
+namespace std { class type_info; }
+
+#include <reporter.hh>
+#include <file-parser.hh>
+#include <configuration.hh>
+#include <writer.hh>
+#include <utils.hh>
+
+#include <string>
+#include <list>
+#include <unordered_map>
+#include <iostream>
+#include <fstream>
+
+#include "writer-base.hh"
+#include "sonarqube-xml-writer.hh"
+
+using namespace kcov;
+
+class SonarQubeWriter : public WriterBase
+{
+public:
+	SonarQubeWriter(IFileParser &parser, IReporter &reporter,
+			const std::string &outFile) :
+		WriterBase(parser, reporter),
+		m_outFile(outFile),
+		m_maxPossibleHits(parser.maxPossibleHits())
+	{
+	}
+
+	void onStartup()
+	{
+	}
+
+	void onStop()
+	{
+	}
+
+	void write()
+	{
+		std::ofstream out(m_outFile);
+
+		// Output directory not writable?
+		if (!out.is_open())
+			return;
+
+		setupCommonPaths();
+
+		out << "<!-- Generated by kcov (https://simonkagstrom.github.io/kcov/) -->\n";
+		out << "<coverage version=\"1\">\n";
+
+		for (FileMap_t::const_iterator it = m_files.begin();
+				it != m_files.end();
+				++it) {
+			File *file = it->second;
+
+			writeOne(file, out);
+		}
+
+		out << "</coverage>\n";
+	}
+
+private:
+	void writeOne(File *file, std::ofstream &out)
+	{
+		out << fmt("	<file path=\"%s\">\n", file->m_name.c_str());
+
+		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
+		{
+			if (!m_reporter.lineIsCode(file->m_name, n))
+					continue;
+
+			IReporter::LineExecutionCount cnt =
+					m_reporter.getLineExecutionCount(file->m_name, n);
+
+			std::string covered = cnt.m_hits ? "true" : "false";
+
+			out << fmt("		<lineToCover lineNumber=\"%d\" covered=\"%s\"/>\n", n, covered.c_str());
+		}
+
+		out << "	</file>\n";
+	}
+
+	std::string getHeader(unsigned int nCodeLines, unsigned int nExecutedLines)
+	{
+		return "<?xml version=\"1.0\" ?>\n";
+	}
+
+	const std::string getFooter()
+	{
+		return "";
+	}
+
+
+	std::string m_outFile;
+	IFileParser::PossibleHits m_maxPossibleHits;
+};
+
+namespace kcov
+{
+	IWriter &createSonarqubeWriter(IFileParser &parser, IReporter &reporter,
+			const std::string &outFile)
+	{
+		return *new SonarQubeWriter(parser, reporter, outFile);
+	}
+}
diff --git a/kcov-38/src/writers/sonarqube-xml-writer.hh b/kcov-38/src/writers/sonarqube-xml-writer.hh
new file mode 100644
index 000000000000..c55d5982ed03
--- /dev/null
+++ b/kcov-38/src/writers/sonarqube-xml-writer.hh
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+	class IOutputHandler;
+
+	IWriter &createSonarqubeWriter(IFileParser &elf, IReporter &reporter,
+			const std::string &outFile);
+}
diff --git a/kcov-38/src/writers/writer-base.cc b/kcov-38/src/writers/writer-base.cc
new file mode 100644
index 000000000000..0986e28ce111
--- /dev/null
+++ b/kcov-38/src/writers/writer-base.cc
@@ -0,0 +1,167 @@
+#define _WITH_GETLINE	// Needed on FreeBSD < 12.0
+#include "writer-base.hh"
+#include <utils.hh>
+
+#include <swap-endian.hh>
+
+#include <stdio.h>
+
+using namespace kcov;
+
+#define SUMMARY_MAGIC   0x456d696c
+#define SUMMARY_VERSION 2
+
+struct summaryStruct
+{
+	uint32_t magic;
+	uint32_t version;
+	uint32_t includeInTotals;
+	uint32_t nLines;
+	uint32_t nExecutedLines;
+	char name[256];
+};
+
+WriterBase::WriterBase(IFileParser &parser, IReporter &reporter) :
+		m_fileParser(parser), m_reporter(reporter), m_commonPath("not set")
+{
+	m_fileParser.registerLineListener(*this);
+}
+
+WriterBase::~WriterBase()
+{
+	for (FileMap_t::iterator it = m_files.begin(); it != m_files.end(); ++it)
+	{
+		File *cur = it->second;
+
+		delete cur;
+	}
+
+	m_files.clear();
+}
+
+WriterBase::File::File(const std::string &filename) :
+		m_name(filename), m_codeLines(0), m_executedLines(0), m_lastLineNr(0)
+{
+	size_t pos = m_name.rfind('/');
+
+	if (pos != std::string::npos)
+		m_fileName = m_name.substr(pos + 1, std::string::npos);
+	else
+		m_fileName = m_name;
+
+	// Make this name unique (we might have several files with the same name)
+	m_crc = hash_block(filename.c_str(), filename.size());
+	readFile(filename);
+
+	m_outFileName = fmt("%s.%x.html", m_fileName.c_str(), m_crc);
+	m_jsonOutFileName = fmt("%s.%x.js", m_fileName.c_str(), m_crc);
+}
+
+void WriterBase::File::readFile(const std::string &filename)
+{
+	FILE *fp = fopen(filename.c_str(), "r");
+	unsigned int lineNr = 1;
+
+	panic_if(!fp, "Can't open %s", filename.c_str());
+
+	while (1)
+	{
+		char *lineptr = NULL;
+		ssize_t res;
+		size_t n;
+
+		res = getline(&lineptr, &n, fp);
+		if (res < 0)
+			break;
+		std::string s(lineptr);
+		s.erase(s.find_last_not_of(" \n\r\t") + 1);
+		m_lineMap[lineNr] = s;
+
+		free((void *) lineptr);
+		lineNr++;
+	}
+
+	m_lastLineNr = lineNr;
+
+	fclose(fp);
+}
+
+void WriterBase::onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+{
+	if (!m_reporter.fileIsIncluded(file))
+		return;
+
+	if (m_files.find(file) != m_files.end())
+		return;
+
+	if (!file_exists(file))
+		return;
+
+	m_files[file] = new File(file);
+}
+
+void *WriterBase::marshalSummary(IReporter::ExecutionSummary &summary, const std::string &name, size_t *sz)
+{
+	struct summaryStruct *p;
+
+	p = (struct summaryStruct *) xmalloc(sizeof(struct summaryStruct));
+	memset(p, 0, sizeof(*p));
+
+	p->magic = to_be<uint32_t>(SUMMARY_MAGIC);
+	p->version = to_be<uint32_t>(SUMMARY_VERSION);
+	p->includeInTotals = to_be<uint32_t>(summary.m_includeInTotals);
+	p->nLines = to_be<uint32_t>(summary.m_lines);
+	p->nExecutedLines = to_be<uint32_t>(summary.m_executedLines);
+	strncpy(p->name, name.c_str(), sizeof(p->name) - 1);
+
+	*sz = sizeof(*p);
+
+	return (void *) p;
+}
+
+bool WriterBase::unMarshalSummary(void *data, size_t sz, IReporter::ExecutionSummary &summary, std::string &name)
+{
+	struct summaryStruct *p = (struct summaryStruct *) data;
+
+	if (sz != sizeof(*p))
+		return false;
+
+	if (be_to_host<uint32_t>(p->magic) != SUMMARY_MAGIC)
+		return false;
+
+	if (be_to_host<uint32_t>(p->version) != SUMMARY_VERSION)
+		return false;
+
+	summary.m_lines = be_to_host<uint32_t>(p->nLines);
+	summary.m_executedLines = be_to_host<uint32_t>(p->nExecutedLines);
+	summary.m_includeInTotals = be_to_host<uint32_t>(p->includeInTotals);
+	name = std::string(p->name);
+
+	return true;
+}
+
+void WriterBase::setupCommonPaths()
+{
+	for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
+	{
+		File *file = it->second;
+
+		if (m_commonPath == "not set")
+			m_commonPath = file->m_name;
+
+		/* Already matching? */
+		if (file->m_name.find(m_commonPath) == 0)
+			continue;
+
+		while (1)
+		{
+			size_t pos = m_commonPath.rfind('/');
+			if (pos == std::string::npos)
+				break;
+
+			m_commonPath = m_commonPath.substr(0, pos);
+			if (file->m_name.find(m_commonPath) == 0)
+				break;
+		}
+	}
+}
diff --git a/kcov-38/src/writers/writer-base.hh b/kcov-38/src/writers/writer-base.hh
new file mode 100644
index 000000000000..cf4b79ab27b8
--- /dev/null
+++ b/kcov-38/src/writers/writer-base.hh
@@ -0,0 +1,64 @@
+#pragma once
+
+#include <writer.hh>
+#include <reporter.hh>
+#include <file-parser.hh>
+
+#include <string>
+#include <unordered_map>
+
+namespace kcov
+{
+	class IFileParser;
+	class IReporter;
+
+	class WriterBase : public IFileParser::ILineListener, public IWriter
+	{
+	protected:
+		WriterBase(IFileParser &elf, IReporter &reporter);
+
+		~WriterBase();
+
+		class File
+		{
+		public:
+			typedef std::unordered_map<unsigned int, std::string> LineMap_t;
+
+			File(const std::string &filename);
+
+			std::string m_name;
+			std::string m_fileName;
+			std::string m_outFileName;
+			std::string m_jsonOutFileName;
+			uint32_t m_crc;
+			LineMap_t m_lineMap;
+			unsigned int m_codeLines;
+			unsigned int m_executedLines;
+			unsigned int m_lastLineNr;
+
+		private:
+			void readFile(const std::string &filename);
+		};
+
+		typedef std::unordered_map<std::string, File *> FileMap_t;
+
+
+		/* Called when the ELF is parsed */
+		void onLine(const std::string &file, unsigned int lineNr, uint64_t addr);
+
+
+		void *marshalSummary(IReporter::ExecutionSummary &summary,
+				const std::string &name, size_t *sz);
+
+		bool unMarshalSummary(void *data, size_t sz,
+				IReporter::ExecutionSummary &summary,
+				std::string &name);
+
+		void setupCommonPaths();
+
+		IFileParser &m_fileParser;
+		IReporter &m_reporter;
+		FileMap_t m_files;
+		std::string m_commonPath;
+	};
+}
diff --git a/kcov-38/tests/CMakeLists.txt b/kcov-38/tests/CMakeLists.txt
new file mode 100644
index 000000000000..d79a4c5c7016
--- /dev/null
+++ b/kcov-38/tests/CMakeLists.txt
@@ -0,0 +1,193 @@
+cmake_minimum_required (VERSION 2.8.4)
+project (kcov-tests)
+
+enable_language(ASM)
+
+if (POLICY CMP0042)
+    # MACOSX_RPATH is enabled by default.
+    cmake_policy (SET CMP0042 NEW)
+endif (POLICY CMP0042)
+
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set (CMAKE_BUILD_TYPE Debug CACHE STRING
+        "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
+        FORCE
+    )
+    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
+        STRINGS None Debug Release RelWithDebInfo MinSizeRel
+    )
+endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+
+set (CMAKE_THREAD_PREFER_PTHREAD ON)
+find_package (Threads REQUIRED)
+
+find_package (ZLIB REQUIRED)
+
+if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+set (DL_LIBRARY "")
+else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+find_library (DL_LIBRARY NAMES dl)
+if (DL_LIBRARY)
+    message (STATUS "Found DL: ${DL_LIBRARY}")
+else (DL_LIBRARY)
+    message (FATAL_ERROR "Could NOT find DL")
+endif (DL_LIBRARY)
+endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+
+find_library (M_LIBRARY NAMES m)
+if (M_LIBRARY)
+    message (STATUS "Found M: ${M_LIBRARY}")
+else (M_LIBRARY)
+    message (FATAL_ERROR "Could NOT find M")
+endif (M_LIBRARY)
+
+include_directories(
+    "${CMAKE_CURRENT_BINARY_DIR}"
+    ../src/include
+)
+set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX}")
+
+add_custom_command (OUTPUT multi-fork-generated.c
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/generate-functions.py"
+            "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/code-template.c"
+            1024
+        > "${CMAKE_CURRENT_BINARY_DIR}/multi-fork-generated.c"
+    DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/generate-functions.py"
+)
+
+add_custom_target(multi-fork-generated ALL
+    DEPENDS multi-fork-generated.c
+)
+set_property(SOURCE multi-fork/test-multi-fork.c APPEND PROPERTY
+    OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/multi-fork-generated.c"
+)
+
+
+set (main_tests_SRCS
+    main.cc
+    subdir/file.c
+    subdir2/file2.c
+)
+
+set (argv_dependent_SRCS
+    argv-dependent.c
+)
+
+set (fork_SRCS
+    fork/fork.c
+)
+
+set (fork_no_wait_SRCS
+    fork/fork-no-wait.c
+)
+
+set (signals_SRCS
+    signals/test-signals.c
+)
+
+set (multi_fork_SRCS
+    multi-fork/test-multi-fork.c
+)
+
+set (recursive-ptrace_SRCS
+    recursive-ptrace/main.cc
+)
+
+set (shared_library_test_SRCS
+    shared-library/main.c
+)
+
+set (test_popen_SRCS
+    popen/test-popen.c
+)
+
+set (global_constructors_SRCS
+    global-constructors/test-global-ctors.cc
+)
+
+set (daemon_SRCS
+    daemon/test-daemon.cc
+)
+
+add_library(shared_library SHARED
+    shared-library/big-symbol.S
+    shared-library/solib.c
+)
+
+add_executable(main-tests ${main_tests_SRCS})
+add_executable(fork ${fork_SRCS})
+add_executable(fork_no_wait ${fork_no_wait_SRCS})
+add_executable(vfork fork/vfork.c)
+add_executable(signals ${signals_SRCS})
+
+add_executable(multi_fork ${multi_fork_SRCS})
+target_link_libraries(multi_fork "${M_LIBRARY}")
+
+add_executable(shared_library_test ${shared_library_test_SRCS})
+target_link_libraries(shared_library_test shared_library)
+
+add_executable(argv_dependent ${argv_dependent_SRCS})
+add_executable(test_popen ${test_popen_SRCS})
+
+add_executable(global-constructors ${global_constructors_SRCS})
+target_link_libraries(global-constructors shared_library)
+
+add_executable(test_daemon ${daemon_SRCS})
+add_executable(multi_1 merge-tests/file.c merge-tests/main_1.c)
+add_executable(multi_2 merge-tests/file.c merge-tests/main_2.c)
+
+add_executable(setpgid-kill setpgid-kill/setpgid-kill-main.cc ../src/utils.cc)
+target_link_libraries(setpgid-kill ${ZLIB_LIBRARIES})
+
+add_executable(issue31 daemon/test-issue31.cc)
+target_link_libraries(issue31 ${CMAKE_THREAD_LIBS_INIT})
+
+add_executable(dlopen dlopen/dlopen.cc dlopen/dlopen-main.cc)
+target_link_libraries(dlopen "${DL_LIBRARY}")
+
+add_executable(s short-file.c)
+add_executable(fork+exec fork/fork+exec.c)
+
+add_executable(thread-test threads/thread-main.c)
+target_link_libraries(thread-test ${CMAKE_THREAD_LIBS_INIT})
+
+#if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+#    add_executable(sanitizer-coverage sanitizer-coverage.c)
+#    set_target_properties(sanitizer-coverage PROPERTIES COMPILE_FLAGS "-g -fsanitize=address -fsanitize-coverage=bb")
+#    set_target_properties(sanitizer-coverage PROPERTIES LINK_FLAGS "-fsanitize=address -fsanitize-coverage=bb")
+#endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+
+add_executable (pie pie.c)
+if (CMAKE_VERSION VERSION_LESS "2.8.9")
+    set_target_properties (pie PROPERTIES COMPILE_FLAGS -fPIE)
+else (CMAKE_VERSION VERSION_LESS "2.8.9")
+    set_target_properties (pie PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif (CMAKE_VERSION VERSION_LESS "2.8.9")
+
+add_executable (pie-test argv-dependent.c)
+if (CMAKE_VERSION VERSION_LESS "2.8.9")
+    set_target_properties (pie-test PROPERTIES COMPILE_FLAGS -fPIE)
+else (CMAKE_VERSION VERSION_LESS "2.8.9")
+    set_target_properties (pie-test PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif (CMAKE_VERSION VERSION_LESS "2.8.9")
+
+if (NOT(CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
+    add_executable(recursive-ptrace ${recursive-ptrace_SRCS})
+    add_custom_target (illegal-insn ALL
+        COMMAND "${CMAKE_C_COMPILER}"
+            -nostdlib
+            "${CMAKE_CURRENT_SOURCE_DIR}/assembly/illegal-insn.S"
+            -o "${CMAKE_CURRENT_BINARY_DIR}/illegal-insn"
+    )
+
+    add_custom_target (fork-32 ALL
+        COMMAND "${CMAKE_C_COMPILER}" -g -m32
+            "${CMAKE_CURRENT_SOURCE_DIR}/fork/fork.c"
+            -o "${CMAKE_CURRENT_BINARY_DIR}/fork-32"
+    )
+endif (NOT(CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
+
+add_custom_target(tests-stripped ALL
+    COMMAND "${CMAKE_STRIP}" -o tests-stripped main-tests
+    DEPENDS main-tests)
diff --git a/kcov-38/tests/argv-dependent.c b/kcov-38/tests/argv-dependent.c
new file mode 100644
index 000000000000..c68acea7fd8b
--- /dev/null
+++ b/kcov-38/tests/argv-dependent.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+
+static int first(int a)
+{
+	printf("first\n");
+	return a + 1;
+}
+
+static int second(int a)
+{
+	printf("second\n");
+	return a + 2;
+}
+
+int main(int argc, const char *argv[])
+{
+	if (argc == 1)
+		first(argc);
+	else
+		second(argc);
+
+	return 0;
+}
diff --git a/kcov-38/tests/assembly/illegal-insn.S b/kcov-38/tests/assembly/illegal-insn.S
new file mode 100644
index 000000000000..2acff9ace224
--- /dev/null
+++ b/kcov-38/tests/assembly/illegal-insn.S
@@ -0,0 +1,4 @@
+.globl _start
+_start:
+	.byte 0xff, 0xff
+	ret
diff --git a/kcov-38/tests/bash/dollar-one-question.sh b/kcov-38/tests/bash/dollar-one-question.sh
new file mode 100755
index 000000000000..1903e5a5202d
--- /dev/null
+++ b/kcov-38/tests/bash/dollar-one-question.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+#echo before
+fparam=${1:?}
+echo $fparam
diff --git a/kcov-38/tests/bash/dollar-var-replacements.sh b/kcov-38/tests/bash/dollar-var-replacements.sh
new file mode 100755
index 000000000000..c0aabba491da
--- /dev/null
+++ b/kcov-38/tests/bash/dollar-var-replacements.sh
@@ -0,0 +1,5 @@
+#/bin/sh
+fname='.A'
+echo ${fname}
+fname="${fname#.}"
+echo ${fname}
diff --git a/kcov-38/tests/bash/first-dir/a.sh b/kcov-38/tests/bash/first-dir/a.sh
new file mode 100644
index 000000000000..d38f21b43f59
--- /dev/null
+++ b/kcov-38/tests/bash/first-dir/a.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo A first
+
+if [ "$1" = "hej" ] ; then
+	source `dirname $0`/c.sh
+fi
+
+source `dirname $0`/b.sh
+
diff --git a/kcov-38/tests/bash/first-dir/b.sh b/kcov-38/tests/bash/first-dir/b.sh
new file mode 100644
index 000000000000..e566b28a99e1
--- /dev/null
+++ b/kcov-38/tests/bash/first-dir/b.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo hejsan
diff --git a/kcov-38/tests/bash/first-dir/c.sh b/kcov-38/tests/bash/first-dir/c.sh
new file mode 100644
index 000000000000..633ead4a9e21
--- /dev/null
+++ b/kcov-38/tests/bash/first-dir/c.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo C now
+
diff --git a/kcov-38/tests/bash/function-with-spaces.sh b/kcov-38/tests/bash/function-with-spaces.sh
new file mode 100755
index 000000000000..8242086dd992
--- /dev/null
+++ b/kcov-38/tests/bash/function-with-spaces.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#!/bin/sh
+#function-with-spaces.sh
+
+fun1() {
+    echo "hello"
+}
+
+fun2 ()
+{
+    echo "world"
+}
+
+#
+# Main
+#
+
+fun1
+fun2
diff --git a/kcov-38/tests/bash/handle-all-output.sh b/kcov-38/tests/bash/handle-all-output.sh
new file mode 100755
index 000000000000..2376325ea535
--- /dev/null
+++ b/kcov-38/tests/bash/handle-all-output.sh
@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+
+for ((i=0; i != 1000; ++i)); do
+  echo "$i"
+done
diff --git a/kcov-38/tests/bash/multiline-alias.sh b/kcov-38/tests/bash/multiline-alias.sh
new file mode 100755
index 000000000000..4b9aa936bbc3
--- /dev/null
+++ b/kcov-38/tests/bash/multiline-alias.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+shopt -s expand_aliases
+alias test_alias='{
+echo called test_alias
+} '
+test_alias
diff --git a/kcov-38/tests/bash/multiline-backslash.sh b/kcov-38/tests/bash/multiline-backslash.sh
new file mode 100755
index 000000000000..f0950b9c69fb
--- /dev/null
+++ b/kcov-38/tests/bash/multiline-backslash.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+USAGE="usage: ${toolName} [--help] [--option1] \\
+       [--option1|--option3] \\
+       function_name [function_options] ...
+"
diff --git a/kcov-38/tests/bash/no-executed-statements.sh b/kcov-38/tests/bash/no-executed-statements.sh
new file mode 100755
index 000000000000..1ff461fbc04c
--- /dev/null
+++ b/kcov-38/tests/bash/no-executed-statements.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+some_test()
+{
+    test "${1}" == "--quiet" &&
+        { quiet=${1} ; shift ; }
+}
diff --git a/kcov-38/tests/bash/other.sh b/kcov-38/tests/bash/other.sh
new file mode 100644
index 000000000000..f9a6ba7ca845
--- /dev/null
+++ b/kcov-38/tests/bash/other.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+echo "This is another shell script"
+
+if [ $1 -eq 5 ] ; then
+	echo "Kalle anka"
+fi
+
+for var in "$@" ; do
+	echo $var
+done
+
+round=0
+for (( ; ; )) do
+	round=$(($round + 1))
+	if [ $round -gt 10 ] ; then
+		break
+	fi
+	echo "hej $round"
+done
+
+echo "Not covered"  # LCOV_EXCL_LINE
+echo "Covered"
+
+# Ranges
+echo "Not covered"  # LCOV_EXCL_START
+echo "Also not covered"
+echo "Also not covered?" # LCOV_EXCL_STOP
+echo "Covered"
+
+# Stacked ranges
+echo "Not covered"  # LCOV_EXCL_START
+echo "Not covered"  # LCOV_EXCL_START
+echo "Also not covered"
+echo "Also not covered?" # LCOV_EXCL_STOP
+echo "Also not covered?" # LCOV_EXCL_STOP
+echo "Covered"
+
+# Unbalanced
+echo "Not covered"  # LCOV_EXCL_START
+echo "Also not covered"
+echo "Also not covered?" # LCOV_EXCL_STOP
+echo "Also not covered?" # LCOV_EXCL_STOP second one
+echo "Covered"
+
+# Custom range CUSTOM_RANGE_START
+echo "Not covered"
+echo "Also not covered"
+echo "Also not covered?"
+# CUSTOM_RANGE_END
+echo "Covered"
+
+# Rust stuff
+echo "Not covered"  # #[should_panic]
+echo "Maybe covered"  # unreachable!
diff --git a/kcov-38/tests/bash/redirect-stderr.sh b/kcov-38/tests/bash/redirect-stderr.sh
new file mode 100755
index 000000000000..0bfb2a7208d9
--- /dev/null
+++ b/kcov-38/tests/bash/redirect-stderr.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+test -n "$FILE" && redirect="> ${FILE}"
+eval echo stuff  2>&1 ${redirect:-}
diff --git a/kcov-38/tests/bash/second-dir/a.sh b/kcov-38/tests/bash/second-dir/a.sh
new file mode 100644
index 000000000000..9282ab9102eb
--- /dev/null
+++ b/kcov-38/tests/bash/second-dir/a.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo A second
+
+if [ $1 = "hej" ] ; then
+	source `dirname $0`/c.sh
+fi
+
+source `dirname $0`/b.sh
+
diff --git a/kcov-38/tests/bash/second-dir/b.sh b/kcov-38/tests/bash/second-dir/b.sh
new file mode 100644
index 000000000000..e566b28a99e1
--- /dev/null
+++ b/kcov-38/tests/bash/second-dir/b.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo hejsan
diff --git a/kcov-38/tests/bash/second-dir/c.sh b/kcov-38/tests/bash/second-dir/c.sh
new file mode 100644
index 000000000000..633ead4a9e21
--- /dev/null
+++ b/kcov-38/tests/bash/second-dir/c.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo C now
+
diff --git a/kcov-38/tests/bash/sh-shebang.sh b/kcov-38/tests/bash/sh-shebang.sh
new file mode 100755
index 000000000000..e6ec725e9842
--- /dev/null
+++ b/kcov-38/tests/bash/sh-shebang.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# This do not shows up in coverage report
+echo "foo from sh"
diff --git a/kcov-38/tests/bash/shell-main b/kcov-38/tests/bash/shell-main
new file mode 100755
index 000000000000..1d5d0b1ee813
--- /dev/null
+++ b/kcov-38/tests/bash/shell-main
@@ -0,0 +1,180 @@
+#!/usr/bin/env bash
+
+function fn0() {
+    echo "fn0 $1"
+}
+
+fn1() # Other fn syntax
+{
+    echo "fn1: Are we really executing this?"
+}
+
+function fn2 { # Yet another
+    echo fn2
+}
+
+function fn3
+{ # Yet yet another
+    echo fn3
+}
+
+
+fn0
+
+if [ $# -eq 1 ] ; then
+	fn1
+fi
+
+A=5
+while [ $A -gt 0 ] ; do
+	A=$(($A - 1))
+	echo $A
+done 
+
+# Comment
+case $# in
+    1)
+      	echo "1 args"
+        ;;
+    (2)
+      	echo "2 args" ;;# Comment
+    'sorry mister')
+        echo "This is very much dead code!"
+        ;;
+    "SORRY")
+    	echo "and more of that here"
+        ;;
+    *)
+      	echo "else args $#"
+        ;;
+esac
+
+for idx in 1 \
+    2 \
+    3 \
+    4 ; do
+    echo "IDX: $idx"
+done
+
+cat <<EOF
+here document
+is here
+EOF
+
+. `dirname $0`/other.sh
+
+if [ $# -eq 2 ] ; then
+	. `dirname $0`/other.sh 5
+fi
+
+if [ $# -gt 0 ]
+then
+	exit $1
+fi
+
+A=awk  '{print HEJ}'<<<$0
+
+echo hoppsan
+
+exec 3>&1
+exec 4>&2
+exec 2>>$1
+exec 1>>$1
+echo hopp
+
+`dirname $0`/short-test.sh
+
+# Issue #50: This breaks
+cat<<EOF || echo "cat failed"
+foo
+bar
+EOF
+
+echo "From here on it do not work!"
+
+`dirname $0`/sh-shebang.sh
+
+# Echo to stderr
+>&2 echo "I'm echoing to stderr via some illogical interface"
+
+function some_test
+    {
+    test "${1}" == "--quiet" &&
+        { quiet=${1} ; shift ; echo hej ; }
+    }
+
+some_test --quiet
+
+declare -r NIGHTLY_CODE_PROJECT_MASK=$(( 1 << 0 ))
+declare -r NIGHTLY_TESTS_PROJECT_MASK=$(( 1 << 1 ))
+declare -r NIGHTLY_DOCS_PROJECT_MASK=$(( 1 << 2 ))
+echo $((
+ 1 << 1))
+
+echo $((
+ 3 << 1
+))
+
+let "a = 1 << 3"
+
+echo After
+
+var=(c)
+test ${#var[*]} -gt 2 -o \
+     "${var[$((${#var[*]} - 1))]}" != "c" ||
+    {
+    echo Some line
+    }
+echo Something else
+
+
+MESSAGE="some message"
+USAGE="usage: some message
+
+   --some-option   Does something
+"
+echo "After usage"
+
+# Issue 116
+SUB=30
+max=$[ 1 << (32 - SUB) ]
+
+echo "$max covered?"
+
+# Issue 116
+cat <<-!
+    Middle
+!
+
+echo "Covered?"
+
+id="# ${work_runtime_error}."
+echo afterid
+
+source `dirname $0`/first-dir/a.sh
+source `dirname $0`/first-dir/b.sh
+source `dirname $0`/first-dir/c.sh
+
+# Issue 152
+# Test 1: Coverage works fine
+printf "foo\nbar\n" | while read -r line
+do
+    echo line: "$line"
+done
+
+# Test 2: Coverage missed for line with here-document
+while read -r line
+do
+    echo line: "$line"
+done <<eof
+baz
+qux
+eof
+
+
+# Issue 154
+booknames=`sqlplus -S -R 3 "$LOGON_STR" <<-EOF
+       select name from books;
+       exit;
+EOF`
+echo $booknames
diff --git a/kcov-38/tests/bash/short-test.sh b/kcov-38/tests/bash/short-test.sh
new file mode 100755
index 000000000000..a5d9504dafff
--- /dev/null
+++ b/kcov-38/tests/bash/short-test.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+for f in 0 1 2 3 4 5 6 7 8 9 10
+do
+	echo $f
+done
diff --git a/kcov-38/tests/bash/subshell.sh b/kcov-38/tests/bash/subshell.sh
new file mode 100755
index 000000000000..05bf1b55a4b5
--- /dev/null
+++ b/kcov-38/tests/bash/subshell.sh
@@ -0,0 +1,8 @@
+#/bin/sh
+eval "(echo Stuff in subshell
+echo More stuff in subshell
+      ) "
+echo "Inbetween stuff"
+(echo "Other subshell"
+echo More stuff in Other subshell
+)
diff --git a/kcov-38/tests/bash/trap.sh b/kcov-38/tests/bash/trap.sh
new file mode 100755
index 000000000000..1cf632b0ec7d
--- /dev/null
+++ b/kcov-38/tests/bash/trap.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+on_trap()
+{
+	echo "On trap"
+	exit 1
+}
+
+trap on_trap SIGTERM
+
+
+while true
+	do read x
+done
diff --git a/kcov-38/tests/bash/unitundertest.sh b/kcov-38/tests/bash/unitundertest.sh
new file mode 100755
index 000000000000..555d249acd79
--- /dev/null
+++ b/kcov-38/tests/bash/unitundertest.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+#unitundertest.sh
+
+block1()
+{
+    echo "In block1()"
+
+    for f in 1 2 3 4 5
+    do
+        echo $f
+    done
+}
+
+block2()
+{
+    echo "In block2()"
+
+    for f in 1 2 3 4 5
+    do
+        echo $f
+    done
+}
+
+#
+# Main
+#
+
+case $1 in
+1)
+    block1
+    ;;
+2)
+    block2
+    ;;
+all)
+    block1
+    block2
+    ;;
+esac
+exit 0
diff --git a/kcov-38/tests/daemon/test-daemon.cc b/kcov-38/tests/daemon/test-daemon.cc
new file mode 100644
index 000000000000..dd24cbf18433
--- /dev/null
+++ b/kcov-38/tests/daemon/test-daemon.cc
@@ -0,0 +1,44 @@
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+void daemonize(void)
+{
+	pid_t child;
+
+	child = fork();
+
+	if (child < 0) {
+		perror("Fork failed?\n");
+		exit(3);
+	} else if (child == 0) {
+		child = fork();
+
+		if (child < 0) {
+			perror("Fork failed?\n");
+			exit(3);
+		} else if (child > 0) {
+			// Second parent
+			exit(1);
+		} else {
+			freopen( "/dev/null", "r", stdin);
+			freopen( "/dev/null", "w", stdout);
+			freopen( "/dev/null", "w", stderr);
+
+			// Daemonized child, just exit after a while
+			sleep(5);
+			exit(4);
+		}
+	} else {
+		// First parent
+		exit(2);
+	}
+}
+
+int main(int argc, const char *argv[])
+{
+	daemonize();
+
+	return 0;
+}
diff --git a/kcov-38/tests/daemon/test-issue31.cc b/kcov-38/tests/daemon/test-issue31.cc
new file mode 100644
index 000000000000..15e82ba0bab5
--- /dev/null
+++ b/kcov-38/tests/daemon/test-issue31.cc
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <fstream>
+#include<pthread.h>
+#include<sys/types.h>
+#include<unistd.h>
+
+void* thread_main(void *) {
+  std::ofstream ofs("thread.log");
+  int i = 0;
+  while(true) {
+    ofs << ++i << std::endl;
+    sleep(1);
+  }
+
+  return NULL;
+}
+
+int main() {
+  pthread_t t;
+  int thread_code = pthread_create(&t, NULL, thread_main, NULL);
+
+  if (thread_code < 0)
+	  return 1;
+
+  std::ofstream ofs("main.log");
+  int i = 0;
+  while(true) {
+    ofs << ++i << std::endl;
+    sleep(1);
+  }
+  return 0;
+}
diff --git a/kcov-38/tests/daemon/test-script.sh b/kcov-38/tests/daemon/test-script.sh
new file mode 100755
index 000000000000..0291fa03bf04
--- /dev/null
+++ b/kcov-38/tests/daemon/test-script.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ $# -ne 3 ] ; then
+	echo "Usage: <kcov-binary> <out-dir> <program-to-run>"
+	exit 1
+fi
+
+kcov=$1
+out=$2
+prg=$3
+
+$prg &
+pid=$!
+
+sleep 0.5
+$kcov --pid=$pid $out $prg &
+kcov_pid=$!
+
+sleep 1.2
+kill $kcov_pid
diff --git a/kcov-38/tests/dlopen/dlopen-main.cc b/kcov-38/tests/dlopen/dlopen-main.cc
new file mode 100644
index 000000000000..aa8795aa90e7
--- /dev/null
+++ b/kcov-38/tests/dlopen/dlopen-main.cc
@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+extern void do_dlopen();
+
+int main(int argc, const char *argv[])
+{
+	do_dlopen();
+	sleep(1);
+
+	return 0;
+}
diff --git a/kcov-38/tests/dlopen/dlopen.cc b/kcov-38/tests/dlopen/dlopen.cc
new file mode 100644
index 000000000000..a86d4f769357
--- /dev/null
+++ b/kcov-38/tests/dlopen/dlopen.cc
@@ -0,0 +1,28 @@
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void do_dlopen()
+{
+	void *handle;
+	int (*sym)(int);
+
+	handle = dlopen("libshared_library.so", RTLD_LAZY);
+	if (!handle) {
+		printf("Can't dlopen\n");
+		exit(1);
+	}
+
+	dlerror();
+	sym = (int (*)(int))dlsym(handle, "vobb");
+	if (!sym) {
+		printf("No symbol\n");
+		dlclose(handle);
+		exit(1);
+	}
+
+	int a = sym(5);
+	printf("from shared lib: %d\n", a);
+
+	dlclose(handle);
+}
diff --git a/kcov-38/tests/fork/fork+exec.c b/kcov-38/tests/fork/fork+exec.c
new file mode 100644
index 000000000000..4443528da84c
--- /dev/null
+++ b/kcov-38/tests/fork/fork+exec.c
@@ -0,0 +1,32 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/user.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sched.h>
+
+
+int main(int argc, const char *argv[])
+{
+	pid_t child;
+	int status;
+
+	child = fork();
+	if (child < 0) {
+		fprintf(stderr, "fork failed!\n");
+		return -1;
+	}
+
+	if (child > 0) {
+		printf("Parent %d\n", getpid());
+	} else if (child < 0) {
+		printf("ERROR!\n");
+	} else {
+		printf("Child, will exec()\n");
+		execvp(argv[1], NULL);
+	}
+
+	waitpid(child, &status, 0);
+
+	return 0;
+}
diff --git a/kcov-38/tests/fork/fork-no-wait.c b/kcov-38/tests/fork/fork-no-wait.c
new file mode 100644
index 000000000000..4d64a97accce
--- /dev/null
+++ b/kcov-38/tests/fork/fork-no-wait.c
@@ -0,0 +1,30 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/user.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sched.h>
+
+
+int main(int argc, const char *argv[])
+{
+	pid_t child;
+
+	child = fork();
+	if (child < 0) {
+		fprintf(stderr, "fork failed!\n");
+		return -1;
+	}
+
+	if (child > 0)
+		printf("Parent %d. Will exit\n", getpid());
+	else {
+		printf("In child, waiting\n");
+		sleep(1);
+		printf("Wait done, parent should be finished by now\n");
+	}
+
+	/* No wait for children */
+
+	return 4; // To test non-0/-1/1 exit codes
+}
diff --git a/kcov-38/tests/fork/fork.c b/kcov-38/tests/fork/fork.c
new file mode 100644
index 000000000000..14317aa2ac40
--- /dev/null
+++ b/kcov-38/tests/fork/fork.c
@@ -0,0 +1,47 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/user.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+// Space added
+// ... so that I don't have to change the tests :-)
+static void mibb(void)
+{
+	printf("Mibb\n");
+}
+
+int main(int argc, const char *argv[])
+{
+	pid_t child;
+	int status;
+
+	child = fork();
+	if (child < 0) {
+		fprintf(stderr, "fork failed!\n");
+		return -1;
+	}
+
+	if (child > 0)
+		printf("Parent %d\n", getpid());
+	else {
+		pid_t grand_child = fork();
+
+
+		if (grand_child < 0)
+			fprintf(stderr, "fork gc failed\n");
+		else if (grand_child == 0) {
+			printf("Grandchild %d\n", getpid());
+			mibb();
+		} else
+			printf("Child %d\n", getpid());
+		wait(&status);
+	}
+
+	mibb();
+
+	printf("Waiting in %d\n", getpid());
+	wait(&status);
+
+	return 0;
+}
diff --git a/kcov-38/tests/fork/vfork.c b/kcov-38/tests/fork/vfork.c
new file mode 100644
index 000000000000..180760bf9fac
--- /dev/null
+++ b/kcov-38/tests/fork/vfork.c
@@ -0,0 +1,27 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/user.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+int main(int argc, const char *argv[])
+{
+	pid_t child;
+	int status;
+
+	child = vfork();
+	if (child < 0) {
+		fprintf(stderr, "vfork failed!\n");
+		return -1;
+	}
+
+	if (child > 0)
+		printf("Parent %d\n", getpid());
+	else {
+		execle("/bin/ls", "/bin/ls", "/bin/ls", NULL, NULL);
+	}
+
+	wait(&status);
+
+	return 0;
+}
diff --git a/kcov-38/tests/global-constructors/test-global-ctors.cc b/kcov-38/tests/global-constructors/test-global-ctors.cc
new file mode 100644
index 000000000000..aaded3cb95bb
--- /dev/null
+++ b/kcov-38/tests/global-constructors/test-global-ctors.cc
@@ -0,0 +1,14 @@
+#include <string>
+#include <stdio.h>
+
+std::string glob = "Kalle";
+
+int main(int argc, const char *argv[])
+{
+	if (argc > 1)
+		glob = "Manne";
+
+	printf("XXX: %s\n", glob.c_str());
+
+	return 0;
+}
diff --git a/kcov-38/tests/include/header.h b/kcov-38/tests/include/header.h
new file mode 100644
index 000000000000..8f0915c961a1
--- /dev/null
+++ b/kcov-38/tests/include/header.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_H
+#define HEADER_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+void tjoho(int a);
+void tjoho2(int a);
+
+#if defined(__cplusplus)
+};
+#endif
+
+#endif
+
+
diff --git a/kcov-38/tests/main.cc b/kcov-38/tests/main.cc
new file mode 100644
index 000000000000..034d660773dd
--- /dev/null
+++ b/kcov-38/tests/main.cc
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include "include/header.h"
+
+class Test
+{
+public:
+	Test()
+	{
+		printf("Constructor\n");
+	}
+
+	void hello()
+	{
+		printf("Hello\n");
+	}
+};
+
+static Test g_test;
+
+int main(int argc, const char *argv[])
+{
+	tjoho(1);
+	tjoho2(0);
+
+	return 0;
+}
diff --git a/kcov-38/tests/merge-tests/file.c b/kcov-38/tests/merge-tests/file.c
new file mode 100644
index 000000000000..e80ffe13323d
--- /dev/null
+++ b/kcov-38/tests/merge-tests/file.c
@@ -0,0 +1,9 @@
+int vobb(void)
+{
+	return 15;
+}
+
+int mibb(void)
+{
+	return 27;
+}
diff --git a/kcov-38/tests/merge-tests/main_1.c b/kcov-38/tests/merge-tests/main_1.c
new file mode 100644
index 000000000000..6a6e548dfb8f
--- /dev/null
+++ b/kcov-38/tests/merge-tests/main_1.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+
+extern int vobb(void);
+
+int main(int argc, const char *argv[])
+{
+	int v = 0;
+
+	if (argc > 1)
+		v = vobb();
+
+	printf("First: V is %d\n", v);
+}
diff --git a/kcov-38/tests/merge-tests/main_2.c b/kcov-38/tests/merge-tests/main_2.c
new file mode 100644
index 000000000000..0facd2390770
--- /dev/null
+++ b/kcov-38/tests/merge-tests/main_2.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+
+extern int mibb(void);
+
+int main(int argc, const char *argv[])
+{
+	int v = 0;
+
+	if (argc > 1)
+		v = mibb();
+
+	printf("Second: V is %d\n", v);
+}
diff --git a/kcov-38/tests/multi-fork/code-template.c b/kcov-38/tests/multi-fork/code-template.c
new file mode 100644
index 000000000000..f4d650fb339c
--- /dev/null
+++ b/kcov-38/tests/multi-fork/code-template.c
@@ -0,0 +1,29 @@
+	volatile double out = 199992.5;
+
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	out = out + sqrt(out);
+	return out;
diff --git a/kcov-38/tests/multi-fork/generate-functions.py b/kcov-38/tests/multi-fork/generate-functions.py
new file mode 100755
index 000000000000..9fb584ef5549
--- /dev/null
+++ b/kcov-38/tests/multi-fork/generate-functions.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import sys
+
+def generate(idx, template):
+	print("double fn%d(void) {" % (idx))
+	print("%s" % (template))
+	print("}")
+	print("")
+
+def generate_table(n):
+	print("const unsigned n_functions = %d;" % (n))
+	print("double (*functions[])(void) = {")
+	for i in range(0, n):
+		print("    fn%d," % (i))
+	print("};")
+	
+if __name__ == "__main__":
+	fileName = sys.argv[1]
+	f = open(fileName)
+	template = f.read()
+	f.close()
+	
+	n = int(sys.argv[2])
+
+	print("#include <math.h>")
+	for i in range(0, n):
+		generate(i, template)
+	generate_table(n)
diff --git a/kcov-38/tests/multi-fork/test-multi-fork.c b/kcov-38/tests/multi-fork/test-multi-fork.c
new file mode 100644
index 000000000000..435e1ce766db
--- /dev/null
+++ b/kcov-38/tests/multi-fork/test-multi-fork.c
@@ -0,0 +1,46 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <sys/mman.h>
+
+#include "multi-fork-generated.c"
+
+int main(int argc, const char *argv[])
+{
+	size_t sz = 16 * 1024 * 1024;
+	unsigned i;
+	size_t n = n_functions;
+
+	for (i = 0; i < n; i++) {
+		pid_t child;
+
+		child = fork();
+		if (child < 0) {
+			fprintf(stderr, "fork failed!\n");
+			return 1;
+		}
+
+		if (child == 0) {
+			// Child
+			functions[i]();
+			exit(0);
+		}
+	}
+
+	while (1) {
+		int status;
+		int res;
+
+		res = wait(&status);
+		// No more children
+		if (res == -1)
+			break;
+	}
+
+	return 0;
+}
diff --git a/kcov-38/tests/pie.c b/kcov-38/tests/pie.c
new file mode 100644
index 000000000000..679b35e088b3
--- /dev/null
+++ b/kcov-38/tests/pie.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main()
+{
+	printf("Hello\n");
+}
+
diff --git a/kcov-38/tests/popen/test-popen.c b/kcov-38/tests/popen/test-popen.c
new file mode 100644
index 000000000000..7c17b1a782fc
--- /dev/null
+++ b/kcov-38/tests/popen/test-popen.c
@@ -0,0 +1,63 @@
+#include <sys/statvfs.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+int test_popen(void)
+{
+	void *data = NULL;
+	size_t chunk = 1024;
+	size_t alloc_sz = chunk;
+	size_t sz = 0;
+	FILE *fp;
+
+	fp = popen("/bin/ls -l /", "r");
+	if (!fp)
+	{
+		fprintf(stderr, "popen failed\n");
+		return 1;
+	}
+
+	/* Read in the entire file */
+	while (!feof(fp)) {
+		size_t ret;
+
+		data = realloc(data, alloc_sz);
+		if (!data)
+		{
+			fprintf(stderr, "realloc %zu failed\n", alloc_sz);
+			break;
+		}
+
+		ret = fread((uint8_t *)data + sz, 1, chunk, fp);
+		sz += ret;
+		/* Reached the end */
+		if (ret < chunk)
+			break;
+		alloc_sz += chunk;
+	}
+
+	free(data);
+
+	pclose(fp);
+
+	return 0;
+}
+
+int main(int argc, const char *argv[])
+{
+	unsigned i;
+
+	for (i = 0; i < 30; i++) {
+		printf("Round %u\n", i);
+		if (test_popen() != 0) {
+			printf("FAIL\n");
+			exit(0);
+		}
+	}
+	printf("popen OK\n");
+
+	return 0;
+}
diff --git a/kcov-38/tests/python/main b/kcov-38/tests/python/main
new file mode 100755
index 000000000000..6c1c9ede8b19
--- /dev/null
+++ b/kcov-38/tests/python/main
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import sys
+import second
+
+def fn():
+    print("hello!")
+    return
+
+def loop_fn():
+    for i in range(0,10):
+        print("NR %d" % (i))
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        print("Need at least one arg")
+        sys.exit(1)
+
+    fn()
+    print("in main, but will return soon")
+    second.second_fn(int(sys.argv[1]))
+
+    try:
+        if int(sys.argv[1]) > 10:
+            raise Exception("metallgutten")
+    except:
+        print("Got an exception")
+
+    loop_fn()
+    sys.exit(int(sys.argv[1]))
diff --git a/kcov-38/tests/python/second.py b/kcov-38/tests/python/second.py
new file mode 100644
index 000000000000..148d8fce9bba
--- /dev/null
+++ b/kcov-38/tests/python/second.py
@@ -0,0 +1,78 @@
+def second_fn(arg):
+    if arg > 5: # Comment here, but valid line
+        print("Yep")
+    # This is a comment
+    print("Hopp")
+    kalle_anka()
+    arne_anka(arg)
+
+def kalle_anka():
+    '''
+    satt
+    pa en planka
+'''
+    pass
+
+def arne_anka(arg):
+    b = """
+    satt
+    inte
+    pa
+    en
+    planka
+"""
+    print(b)
+    jens_anka(arg)
+    jens_anka(9)
+
+def viktor_anka():
+    """Single-line multi-line string"""
+
+    return 0
+
+def jens_anka(kalle):
+    v = """Single-line multi-line string"""
+
+    if kalle > 5:
+        print("Hej")
+    elif kalle > 128:
+        print("Commodore 128")
+    else:
+        print("Hopp")
+    sven_anka()
+
+def sven_anka():
+    'single-quoted line'
+    jerker_anka()
+
+def mats_anka():
+    "single-quoted line"
+    pass
+
+dict = {
+    2 : [ 1, 2, 3],
+    3 : [ 4,
+         5, 6
+        ],
+    5 :
+        {
+         9 : 1,
+         },
+    6 :
+        { },
+    7 :
+        { 1 : 2
+         },
+    8 :
+        [
+         1, 2
+         ]
+}
+
+def jerker_anka():
+    try:
+        f = open("/tmp/a")
+    except:
+        print("Exception")
+    finally:
+        print("Finally finally!")
diff --git a/kcov-38/tests/python/short-test.py b/kcov-38/tests/python/short-test.py
new file mode 100755
index 000000000000..711ca606b3d3
--- /dev/null
+++ b/kcov-38/tests/python/short-test.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import sys
+
+def doSomething():
+    print 'Hello world'
+
+
+if __name__ == '__main__':
+    doSomething()
diff --git a/kcov-38/tests/python/unittest/testdriver b/kcov-38/tests/python/unittest/testdriver
new file mode 100755
index 000000000000..9c474ef5e3de
--- /dev/null
+++ b/kcov-38/tests/python/unittest/testdriver
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import sys
+import unittest
+
+class testcase (unittest.TestCase):
+
+    def setUp(self):
+        print('in setUp()')
+        self.unitundertest = unitundertest.testme()
+
+    def testMethod1(self):
+        print('in testcase.testMethod1()')
+        expected=4
+        result= self.unitundertest.testmethod1(2,2)
+
+        self.assertEqual(expected,result)
+
+
+if __name__ == '__main__':
+    sys.path.append('.')
+
+    try:
+        import unitundertest
+    except:
+        print('exception')
+
+    unittest.main()
diff --git a/kcov-38/tests/python/unittest/unitundertest.py b/kcov-38/tests/python/unittest/unitundertest.py
new file mode 100644
index 000000000000..0f66e70b3c45
--- /dev/null
+++ b/kcov-38/tests/python/unittest/unitundertest.py
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+import sys
+
+class testme:
+    def __init__(self):
+        print('ctor')
+
+    def testmethod1(self,a,b):
+        print('in testmethod1()')
+        return a+b
diff --git a/kcov-38/tests/recursive-ptrace/main.cc b/kcov-38/tests/recursive-ptrace/main.cc
new file mode 100644
index 000000000000..8e97affa40db
--- /dev/null
+++ b/kcov-38/tests/recursive-ptrace/main.cc
@@ -0,0 +1,68 @@
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sched.h>
+#include <stdio.h>
+
+int forkAndAttach()
+{
+	pid_t child, who;
+	int status;
+
+	child = fork();
+	if (child < 0) {
+		fprintf(stderr, "fork failed!\n");
+		return -1;
+	}
+
+	if (child == 0) {
+		int res;
+
+		/* We're in the child, set me as traced */
+#ifdef __linux__
+		res = ptrace(PTRACE_TRACEME, 0, 0, 0);
+#elif defined(__FreeBSD__)
+		res = ptrace(PT_TRACE_ME, 0, 0, 0);
+#endif
+		if (res < 0) {
+			fprintf(stderr, "Can't set me as ptraced\n");
+			return -1;
+		}
+		::kill(getpid(), SIGSTOP);
+
+		return 0;
+	}
+
+	/* Wait for the initial stop */
+	who = waitpid(child, &status, 0);
+	if (who < 0) {
+		fprintf(stderr, "waitpid failed\n");
+		return -1;
+	}
+	if (!WIFSTOPPED(status)) {
+		fprintf(stderr, "Child hasn't stopped: %x\n", status);
+		return -1;
+	}
+#ifdef __linux__
+	ptrace(PTRACE_SETOPTIONS, child, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK);
+#elif defined(__FreeBSD__)
+	ptrace(PT_FOLLOW_FORK, child, NULL, 1);
+#endif
+
+	return child;
+}
+
+int main(int argc, const char *argv[])
+{
+	int res = forkAndAttach();
+
+	if (res >= 0)
+		printf("OK!\n");
+	else
+		printf("NOK!\n");
+
+	return res >= 0;
+}
diff --git a/kcov-38/tests/sanitizer-coverage.c b/kcov-38/tests/sanitizer-coverage.c
new file mode 100644
index 000000000000..b9717a4442ba
--- /dev/null
+++ b/kcov-38/tests/sanitizer-coverage.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+
+static int fn(int a)
+{
+	printf("fn %d\n", a);
+
+	a = a + 1;
+	a = a + 2;
+
+	return a + 3;
+}
+
+int main(int argc, const char *argv[])
+{
+	if (argc == 1) {
+		int out = fn(argc + 1);
+
+		out++;
+
+		return out;
+	} else {
+		fn(5);
+	}
+
+	return 0;
+}
diff --git a/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc b/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
new file mode 100644
index 000000000000..7b57d1d2785a
--- /dev/null
+++ b/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
@@ -0,0 +1,28 @@
+#include <stdio.h>
+#include <unistd.h>
+
+#include <utils.hh>
+
+int main (int argc, char** argv)
+{
+    printf("pid: %d\n", getpid());
+    printf("pgid: %d\n", getpgid(0));
+
+    printf("calling setpgid...\n");
+    const int result = setpgid(0, 0);
+    printf("setpgid result: %d\n", result);
+
+    int pid = getpid();
+    printf("pid: %d\n", pid);
+    printf("pgid: %d\n", getpgid(0));
+
+    std::string s = fmt("%d\n", pid);
+    write_file(s.c_str(), s.size(), "/tmp/setpgid.pid");
+
+    // Long sleep just to allow kcov to clean up stuff
+    sleep(20);
+
+    printf("After sleep\n");
+
+    return 0;
+}
diff --git a/kcov-38/tests/setpgid-kill/test-script.sh b/kcov-38/tests/setpgid-kill/test-script.sh
new file mode 100755
index 000000000000..7c34ed9c36af
--- /dev/null
+++ b/kcov-38/tests/setpgid-kill/test-script.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+prg=$*
+
+$prg &
+sleep 1
+kill -TERM %1
+
+sleep 2
+
+pid=`cat /tmp/setpgid.pid`
+if ps -p $pid > /dev/null ; then
+	echo "FAIL"
+else
+	echo "SUCCESS"
+fi
diff --git a/kcov-38/tests/shared-library/big-symbol.S b/kcov-38/tests/shared-library/big-symbol.S
new file mode 100644
index 000000000000..1675d6645cbd
--- /dev/null
+++ b/kcov-38/tests/shared-library/big-symbol.S
@@ -0,0 +1,9 @@
+.text
+.globl very_big_symbol
+very_big_symbol:
+	.fill 4096, 1, 0x90
+#if defined(__PPC__)
+	blr
+#else
+	ret
+#endif
diff --git a/kcov-38/tests/shared-library/main.c b/kcov-38/tests/shared-library/main.c
new file mode 100644
index 000000000000..1b00a3b84306
--- /dev/null
+++ b/kcov-38/tests/shared-library/main.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+extern int vobb(int a);
+
+int main(int argc, const char *argv[])
+{
+	printf("In main\n");
+
+	vobb(argc);
+
+	return 0;
+}
diff --git a/kcov-38/tests/shared-library/recursive-ld-preload.c b/kcov-38/tests/shared-library/recursive-ld-preload.c
new file mode 100644
index 000000000000..4c327bea4ac9
--- /dev/null
+++ b/kcov-38/tests/shared-library/recursive-ld-preload.c
@@ -0,0 +1,7 @@
+#include <stdlib.h>
+
+// Load this library and exit again!
+void __attribute__((constructor)) meaningless_library()
+{
+	exit(93);
+}
diff --git a/kcov-38/tests/shared-library/solib.c b/kcov-38/tests/shared-library/solib.c
new file mode 100644
index 000000000000..571d5539f4cf
--- /dev/null
+++ b/kcov-38/tests/shared-library/solib.c
@@ -0,0 +1,18 @@
+#include <stdio.h>
+
+int vobb(int a)
+{
+	printf("In shared library\n");
+
+	a = a + 1;
+
+	if (a > 2)
+		return 1;
+
+	return 0;
+}
+
+void this_function_should_not_be_called(void)
+{
+	printf("If it is, something is wrong\n");
+}
diff --git a/kcov-38/tests/short-file.c b/kcov-38/tests/short-file.c
new file mode 100644
index 000000000000..574741f80814
--- /dev/null
+++ b/kcov-38/tests/short-file.c
@@ -0,0 +1 @@
+int main() {return 99;}
diff --git a/kcov-38/tests/signals/test-signals.c b/kcov-38/tests/signals/test-signals.c
new file mode 100644
index 000000000000..7a122d1ac34e
--- /dev/null
+++ b/kcov-38/tests/signals/test-signals.c
@@ -0,0 +1,297 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/user.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <sched.h>
+
+
+void catch_hup(int sig)
+{
+	printf("HUP\n");
+}
+
+void catch_int(int sig)
+{
+	printf("INT\n");
+}
+
+void catch_quit(int sig)
+{
+	printf("QUIT\n");
+}
+
+void catch_ill(int sig)
+{
+	printf("ILL\n");
+}
+
+void catch_trap(int sig)
+{
+	printf("TRAP\n");
+}
+
+void catch_abrt(int sig)
+{
+	printf("ABRT\n");
+}
+
+void catch_bus(int sig)
+{
+	printf("BUS\n");
+}
+
+void catch_fpe(int sig)
+{
+	printf("FPE\n");
+}
+
+void catch_kill(int sig)
+{
+	printf("KILL\n");
+}
+
+void catch_usr1(int sig)
+{
+	printf("USR1\n");
+}
+
+void catch_segv(int sig)
+{
+	printf("SEGV\n");
+}
+
+void catch_usr2(int sig)
+{
+	printf("USR2\n");
+}
+
+void catch_pipe(int sig)
+{
+	printf("PIPE\n");
+}
+
+void catch_alarm(int sig)
+{
+	printf("ALARM\n");
+}
+
+void catch_term(int sig)
+{
+	printf("TERM\n");
+}
+
+void catch_stkflt(int sig)
+{
+	printf("STKFLT\n");
+}
+
+void catch_chld(int sig)
+{
+	printf("CHLD\n");
+}
+
+void catch_cont(int sig)
+{
+	printf("CONT\n");
+}
+
+void catch_stop(int sig)
+{
+	printf("STOP\n");
+}
+
+void catch_stp(int sig)
+{
+	printf("STP\n");
+}
+
+void catch_ttin(int sig)
+{
+	printf("TTIN\n");
+}
+
+void catch_ttou(int sig)
+{
+	printf("TTOU\n");
+}
+
+void catch_urg(int sig)
+{
+	printf("URG\n");
+}
+
+void catch_xcpu(int sig)
+{
+	printf("XCPU\n");
+}
+
+void catch_xfsz(int sig)
+{
+	printf("XFSZ\n");
+}
+
+void catch_vtalrm(int sig)
+{
+	printf("VTALRM\n");
+}
+
+void catch_prof(int sig)
+{
+	printf("PROF\n");
+}
+
+void catch_winch(int sig)
+{
+	printf("WINCH\n");
+}
+
+void catch_gio(int sig)
+{
+	printf("GIO\n");
+}
+
+void catch_pwr(int sig)
+{
+	printf("PWR\n");
+}
+
+void catch_sys(int sig)
+{
+	printf("SYS\n");
+}
+
+static const char *handler_names[] =
+{
+	"zero has no handler",
+	"hup",
+	"int",
+	"quit",
+	"ill",
+	"trap",
+	"abrt",
+	"bus",
+	"fpe",
+	"kill",
+	"usr1",
+	"segv",
+	"usr2",
+	"pipe",
+	"alarm",
+	"term",
+	"stkflt",
+	"chld",
+	"cont",
+	"stop",
+	"stp",
+	"ttin",
+	"ttou",
+	"urg",
+	"xcpu",
+	"xfsz",
+	"vtalrm",
+	"prof",
+	"winch",
+	"gio",
+	"pwr",
+	"sys",
+};
+
+static void (*handler_table[])(int) =
+{
+	NULL,
+	catch_hup,  //SIGHUP
+	catch_int,  //SIGINT
+	catch_quit, //SIGQUIT
+	catch_ill,  //SIGILL
+	catch_trap, //SIGTRAP
+	catch_abrt, //SIGABRT
+	catch_bus,  //SIGBUS
+	catch_fpe,  //SIGFPE
+	catch_kill, //SIGKILL
+	catch_usr1, //SIGUSR1
+	catch_segv, //SIGSEGV
+	catch_usr2, //SIGUSR2
+	catch_pipe, //SIGPIPE
+	catch_alarm,//SIGALRM
+	catch_term, //SIGTERM
+	catch_stkflt,//SIGSTKFLT
+	catch_chld, //SIGCHLD
+	catch_cont, //SIGCONT
+	catch_stop, //SIGSTOP
+	catch_stp,  //SIGTSTP
+	catch_ttin, //SIGTTIN
+	catch_ttou, //SIGTTOU
+	catch_urg,  //SIGURG
+	catch_xcpu, //SIGXCPU
+	catch_xfsz, //SIGXFSZ
+	catch_vtalrm,//SIGVTALRM
+	catch_prof, //SIGPROF
+	catch_winch,//SIGWINCH
+	catch_gio,  //SIGIO
+	catch_pwr,  //SIGPWR
+	catch_sys,  //SIGSYS
+};
+
+
+
+int main(int argc, const char *argv[])
+{
+	pid_t child;
+	int status;
+	int sig;
+	unsigned self = 0;
+	size_t n_handlers = sizeof(handler_names) / sizeof(handler_names[0]);
+
+	if (argc <= 1) {
+		printf("Usage: xxx <signal> [self]\n");
+		exit(1);
+	}
+
+	if (argc == 3)
+		self = 1;
+
+	for (sig = 0; sig < n_handlers; sig++) {
+			if (strcmp(argv[1], handler_names[sig]) == 0)
+				break;
+	}
+	if (sig == n_handlers) {
+		printf("Unknown handler %s\n", argv[1]);
+		exit(1);
+	}
+
+	if (self) {
+		// Test actual crashes / panics
+		if (sig != SIGABRT && sig != SIGSEGV)
+			signal(sig, handler_table[sig]);
+
+		kill(getpid(), sig);
+
+		return 0;
+	}
+
+
+	child = fork();
+	if (child < 0) {
+		fprintf(stderr, "fork failed!\n");
+		return -1;
+	}
+
+	if (child == 0) {
+		signal(sig, handler_table[sig]);
+
+		sleep(2);
+		return 0;
+	} else {
+		// Parent
+		sleep(1);
+		kill(child, sig);
+	}
+
+	wait(&status);
+
+	return 0;
+}
diff --git a/kcov-38/tests/subdir/file.c b/kcov-38/tests/subdir/file.c
new file mode 100644
index 000000000000..708ee866a3c3
--- /dev/null
+++ b/kcov-38/tests/subdir/file.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include "../include/header.h"
+
+void tjoho(int a)
+{
+	if (a)
+		printf("Hej\n");
+}
diff --git a/kcov-38/tests/subdir2/file.c b/kcov-38/tests/subdir2/file.c
new file mode 100644
index 000000000000..bd3e5b5d80d1
--- /dev/null
+++ b/kcov-38/tests/subdir2/file.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include "../include/header.h"
+
+void tjoho2(int a)
+{
+	if (a)
+		printf("Hej\n");
+}
diff --git a/kcov-38/tests/subdir2/file2.c b/kcov-38/tests/subdir2/file2.c
new file mode 100644
index 000000000000..bd3e5b5d80d1
--- /dev/null
+++ b/kcov-38/tests/subdir2/file2.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include "../include/header.h"
+
+void tjoho2(int a)
+{
+	if (a)
+		printf("Hej\n");
+}
diff --git a/kcov-38/tests/test-module/Makefile b/kcov-38/tests/test-module/Makefile
new file mode 100644
index 000000000000..df235385a659
--- /dev/null
+++ b/kcov-38/tests/test-module/Makefile
@@ -0,0 +1,12 @@
+KDIR := /lib/modules/$(shell uname -r)/build
+PWD := $(shell pwd)
+
+CFLAGS_test_module.o += -g3
+
+obj-m += test_module.o
+
+default:
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+
+clean:
+	rm -f *.o *.ko *.order *.symvers *.mod.c
diff --git a/kcov-38/tests/test-module/test_module.c b/kcov-38/tests/test-module/test_module.c
new file mode 100644
index 000000000000..6c26335563b7
--- /dev/null
+++ b/kcov-38/tests/test-module/test_module.c
@@ -0,0 +1,64 @@
+/*
+ *
+ * Copyright (C) 2012 Simon Kagstrom
+ *
+ * Author: Simon Kagstrom <simon.kagstrom@gmail.com>
+ *
+ * Most of the stuff comes from Jonathan Corbets seqfile example here:
+ *
+ *   http://lwn.net/Articles/22359/
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+
+#include <linux/proc_fs.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+
+static int hz_show(struct seq_file *m, void *v)
+{
+    seq_printf(m, "%d\n", HZ);
+
+    return 0;
+}
+
+static int hz_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, hz_show, NULL);
+}
+
+static const struct file_operations ct_file_ops = {
+    .owner	= THIS_MODULE,
+    .open	= hz_open,
+    .read	= seq_read,
+    .llseek	= seq_lseek,
+    .release = single_release,
+};
+
+static int __init test_init(void)
+{
+	struct proc_dir_entry *entry;
+
+	printk(KERN_INFO "initing test module!\n");
+
+	entry = create_proc_entry("test_module", 0, NULL);
+	if (entry)
+		entry->proc_fops = &ct_file_ops;
+	return 0;
+}
+
+static void __exit test_exit(void)
+{
+	remove_proc_entry("test_module", NULL);
+}
+
+module_init(test_init);
+module_exit(test_exit);
+MODULE_AUTHOR("Simon Kagstrom <simon.kagstrom@gmail.com>");
+MODULE_DESCRIPTION("Test");
+MODULE_LICENSE("GPL");
diff --git a/kcov-38/tests/threads/thread-main.c b/kcov-38/tests/threads/thread-main.c
new file mode 100644
index 000000000000..43ae4e4dfd2c
--- /dev/null
+++ b/kcov-38/tests/threads/thread-main.c
@@ -0,0 +1,40 @@
+#include <pthread.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <semaphore.h>
+#include <stdlib.h>
+
+void *thread_cb(void *ptr)
+{
+	printf("Thread Created\r\n");
+
+	return NULL;
+}
+
+void* real_thread_create()
+{
+	pthread_t thr;
+	int i;
+
+	// 10 seconds
+	for (i = 0; i < 1000; i++) {
+		pthread_create(&thr, NULL, thread_cb, NULL);
+		usleep(10 * 1000); // 10 ms
+	}
+
+	return NULL;
+}
+
+
+int main(int argc, const char *argv[])
+{
+	pthread_t tid;
+	void *retv;
+
+	pthread_create(&tid, NULL, real_thread_create, NULL);
+
+	pthread_join(tid, &retv);
+
+	return 0;
+}
+
diff --git a/kcov-38/tests/tools/accumulate.py b/kcov-38/tests/tools/accumulate.py
new file mode 100644
index 000000000000..9b04395c5d45
--- /dev/null
+++ b/kcov-38/tests/tools/accumulate.py
@@ -0,0 +1,80 @@
+import testbase
+import unittest
+import parse_cobertura
+
+class accumulate_data(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
+        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
+
+        rv,o = self.do(testbase.kcov + " "+ testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 2
+
+class dont_accumulate_data_with_clean(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
+        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
+
+        rv,o = self.do(testbase.kcov + " --clean "+ testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 0
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
+
+class merge_basic(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
+
+class merge_multiple_output_directories(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/first " + testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/second " + testbase.sources + "/tests/bash/shell-main")
+        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/first " + testbase.outbase + "/kcov/second")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/merged/kcov-merged/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
+
+class merge_merged_output(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/first " + testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/second " + testbase.sources + "/tests/bash/shell-main")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/third " + testbase.sources + "/tests/bash/dollar-var-replacements.sh")
+
+        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/first " + testbase.outbase + "/kcov/second")
+        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged2 " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/third")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/merged2/kcov-merged/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
+        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1
+
+class merge_coveralls(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --coveralls-id=dry-run " + testbase.outbase + "/kcov/ " + testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " --coveralls-id=dry-run " + testbase.outbase + "/kcov/ " + testbase.sources + "/tests/bash/shell-main")
+
+        rv,o = self.doShell("grep second.py %s/kcov/main/coveralls.out" % (testbase.outbase))
+        assert rv == 0
+        rv,o = self.doShell("grep shell-main %s/kcov/shell-main/coveralls.out" % (testbase.outbase))
+        assert rv == 0
diff --git a/kcov-38/tests/tools/bash.py b/kcov-38/tests/tools/bash.py
new file mode 100644
index 000000000000..5fe489de79e3
--- /dev/null
+++ b/kcov-38/tests/tools/bash.py
@@ -0,0 +1,326 @@
+import testbase
+import os
+import unittest
+import parse_cobertura
+
+class BashBase(testbase.KcovTestCase):
+    def doTest(self, args):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main " + args)
+
+        return parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+
+class bash_coverage(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 3) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 13) == 0
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 26) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 30) == 5
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 34) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 38) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 5) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "short-test.sh", 5) == 11
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 128) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 132) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 135) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 136) == 1
+
+        assert b"I'm echoing to stderr via some" in o
+
+
+# Very limited, will expand once it's working better
+class bash_coverage_debug_trap(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-method=DEBUG " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 3) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 22) == 1
+
+class bash_short_file(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/short-test.sh")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/short-test.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "short-test.sh", 5) == 11
+
+class bash_heredoc_backslashes(BashBase):
+    def runTest(self):
+        dom = self.doTest("5")
+
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 52) == 4
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 53) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 55) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 59) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 61) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 62) == None
+
+class bash_heredoc_special_cases_issue_44(BashBase):
+    def runTest(self):
+        dom = self.doTest("")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 77) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 83) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 88) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 93) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 109) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 118) == 1
+
+class bash_non_empty_braces(BashBase):
+    def runTest(self):
+        dom = self.doTest("")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 102) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 103) == 3
+
+class bash_coverage_tricky(BashBase):
+    def runTest(self):
+        dom = self.doTest("5")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 36) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 44) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 7) == None
+
+class bash_honor_signal(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/trap.sh", False)
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/trap.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "trap.sh", 5) == 1
+
+class bash_accumulate_data(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 1")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 0
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 2")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 1
+
+class bash_accumulate_changed_data(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        os.system("mkdir -p /tmp/test-kcov")
+        os.system("cp " + testbase.sources + "/tests/bash/shell-main /tmp/test-kcov")
+        os.system("cp " + testbase.sources + "/tests/bash/other.sh /tmp/test-kcov")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov /tmp/test-kcov/shell-main 5 9")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 40) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 67) == 2
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 6) == 2
+        os.system("echo \"echo 'arne-anka'\" >> /tmp/test-kcov/shell-main")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov /tmp/test-kcov/shell-main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 40) == 0
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 67) == 0
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 6) == 3
+
+class bash_merge_data_issue_38(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 1")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 0
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 2")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 1
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh all")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 36) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 30) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 33) == 1
+        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 36) == 1
+
+class bash_issue_116_arithmetic_and_heredoc_issue_117_comment_within_string(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 142) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 149) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 151) == 1
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 152) == 1
+
+class bash_multiline_quotes(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/multiline-alias.sh")
+
+        assert b"echo called test_alias" not in o
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/multiline-alias.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "multiline-alias.sh", 6) == 1
+
+class bash_multiline_backslashes(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/multiline-backslash.sh")
+
+        assert b"function_name" not in o
+
+class bash_no_executed_lines(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/no-executed-statements.sh")
+
+        assert b"echo called test_alias" not in o
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/no-executed-statements.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "no-executed-statements.sh", 4) == 0
+
+class bash_stderr_redirection(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/redirect-stderr.sh")
+
+        assert b"kcov" not in o
+        rv,o = self.do(testbase.kcov + " --debug-force-bash-stderr " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/redirect-stderr.sh")
+        assert b"kcov" not in o
+
+class bash_dollar_var_replacement(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/dollar-var-replacements.sh")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dollar-var-replacements.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1
+        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 4) == 1
+        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 5) == 1
+
+# Issue #152
+class bash_done_eof(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 163) == None
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 169) == None
+
+# Issue #154
+class bash_eof_backtick(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 180) == 1
+
+class bash_subshell(testbase.KcovTestCase):
+    def runTest(self):
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/subshell.sh")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/subshell.sh/cobertura.xml")
+        self.assertIsNone(parse_cobertura.hitsPerLine(dom, "subshell.sh", 1))
+        self.assertEqual(2, parse_cobertura.hitsPerLine(dom, "subshell.sh", 4))
+        self.assertEqual(0, parse_cobertura.hitsPerLine(dom, "subshell.sh", 8))
+
+class bash_handle_all_output(testbase.KcovTestCase):
+    def runTest(self):
+        script = "handle-all-output.sh"
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " +
+            testbase.sources + "/tests/bash/" + script,
+            timeout=5.0)
+        self.assertEqual(0, rv, "kcov exited unsuccessfully")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/" + script + "/cobertura.xml")
+        self.assertIsNone(parse_cobertura.hitsPerLine(dom, script, 1))
+        self.assertEqual(1000, parse_cobertura.hitsPerLine(dom, script, 4))
+
+class bash_exit_status(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.sources + "/tests/bash/shell-main 5", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
+
+        assert rv == noKcovRv
+
+# Issue 180
+class bash_ignore_uncovered(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --exclude-region=CUSTOM_RANGE_START:CUSTOM_RANGE_END " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/other.sh")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/other.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 22) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 23) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 26) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 27) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 28) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 29) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 32) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 34) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 35) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 36) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 37) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 40) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 42) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 43) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 47) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 48) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 49) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 51) == 1
+
+        # Rust stuff
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 54) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 55) == 1
+
+# Issue #224
+class bash_can_find_non_executed_scripts(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "a.sh", 5) == 1
+        # Not executed
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == 0
+
+class bash_can_find_non_executed_scripts_manually(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-parse-files-in-dir=" + testbase.sources + "/tests/bash " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
+        # Not executed
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == 0
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 3) == 0
+
+class bash_can_ignore_non_executed_scripts(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "a.sh", 5) == 1
+        # Not included in report
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
+        assert parse_cobertura.hitsPerLine(dom, "other.sh", 3) == None
+
+class bash_can_ignore_function_with_spaces(testbase.KcovTestCase):
+    def runTest(self):
+        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/function-with-spaces.sh")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/function-with-spaces.sh/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 5) == None
+        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 6) == 1
+        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 9) == None
+        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 10) == None
+        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 11) == 1
diff --git a/kcov-38/tests/tools/bash_linux_only.py b/kcov-38/tests/tools/bash_linux_only.py
new file mode 100644
index 000000000000..c7a46f5fad93
--- /dev/null
+++ b/kcov-38/tests/tools/bash_linux_only.py
@@ -0,0 +1,12 @@
+import testbase
+import os
+import unittest
+import parse_cobertura
+
+class bash_sh_shebang(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-handle-sh-invocation " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "sh-shebang.sh", 4) == 1
diff --git a/kcov-38/tests/tools/basic.py b/kcov-38/tests/tools/basic.py
new file mode 100644
index 000000000000..d7ccda196644
--- /dev/null
+++ b/kcov-38/tests/tools/basic.py
@@ -0,0 +1,28 @@
+import testbase
+import unittest
+import parse_cobertura
+import os
+
+class TooFewArguments(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv, output = self.do(testbase.kcov + " " + testbase.outbase + "/kcov")
+        assert rv == 1
+
+class WrongArguments(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv, output = self.do(testbase.kcov + " --abc=efg " + testbase.outbase + "/kcov " + testbase.testbuild + "/tests-stripped")
+        assert rv == 1
+
+class LookupBinaryInPath(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        os.environ["PATH"] += testbase.sources + "/tests/python"
+        noKcovRv,o = self.do(testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + "main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 34) == 2
+        assert noKcovRv, rv
diff --git a/kcov-38/tests/tools/compiled.py b/kcov-38/tests/tools/compiled.py
new file mode 100644
index 000000000000..e4eb8f4c13e2
--- /dev/null
+++ b/kcov-38/tests/tools/compiled.py
@@ -0,0 +1,474 @@
+import testbase
+import unittest
+import parse_cobertura
+import sys
+import os
+
+class illegal_insn(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        rv, output = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/illegal-insn", False)
+        assert rv != 0
+        assert b'Illegal instructions are' in output
+
+class fork_no_wait(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/fork_no_wait", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/fork_no_wait", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/fork_no_wait/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 20) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 22) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 24) >= 1
+
+class ForkBase(testbase.KcovTestCase):
+    def doTest(self, binary):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/" + binary, False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/" + binary, False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/" + binary + "/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "fork.c", 21) == 0
+        assert parse_cobertura.hitsPerLine(dom, "fork.c", 26) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "fork.c", 34) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "fork.c", 37) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "fork.c", 46) >= 1
+
+class fork_64(ForkBase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.doTest("fork")
+
+class fork_32(ForkBase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.doTest("fork-32")
+
+class vfork(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/vfork", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/vfork/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "vfork.c", 12) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "vfork.c", 18) >= 1
+
+class shared_library(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/shared_library_test", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
+
+class shared_library_skip(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --skip-solibs " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == None
+
+
+class shared_library_filter_out(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --exclude-pattern=solib " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == None
+
+
+class shared_library_accumulate(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test 5", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 10) == 1
+
+class MainTestBase(testbase.KcovTestCase):
+    def doTest(self, verify):
+        self.setUp()
+
+        noKcovRv,o = self.do(testbase.testbuild + "/main-tests", False)
+        rv,o = self.do(testbase.kcov + " " + verify + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests 5", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 14) == None
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 18) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 25) == 1
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 6) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "file2.c", 7) == 0
+
+
+class main_test(MainTestBase):
+    def runTest(self):
+        self.doTest("")
+
+class main_test_verify(MainTestBase):
+    def runTest(self):
+        self.doTest("--verify")
+
+class main_test_lldb_raw_breakpoints(MainTestBase):
+    def runTest(self):
+        self.doTest("--configure=lldb-use-raw-breakpoint-writes=1")
+
+class popen_test(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/test_popen", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_popen", False)
+        assert rv == noKcovRv
+
+        assert b"popen OK" in o
+
+class short_filename(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov ./s", False)
+        assert rv == 99
+
+
+class Pie(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/pie", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "pie.c", 5) == 1
+
+class pie_argv_basic(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 0
+
+class pie_accumulate(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 0
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test a", False)
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 1
+
+
+class global_ctors(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/global-constructors", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/global-constructors", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/global-constructors/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "test-global-ctors.cc", 4) >= 1
+
+class daemon_wait_for_last_child(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #158")
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/test_daemon", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_daemon", False)
+        assert rv == 4
+        assert noKcovRv == 2
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 1
+
+class SignalsBase(testbase.KcovTestCase):
+    def SignalsBase():
+        self.m_self = "";
+
+    def cmpOne(self, sig):
+        noKcovRv,o = self.do(testbase.testbuild + "/signals " + sig + " " + self.m_self, False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals " + sig + " " + self.m_self, False)
+        assert rv == noKcovRv
+
+        return parse_cobertura.parseFile(testbase.outbase + "/kcov/signals/cobertura.xml")
+
+    def doTest(self):
+        self.setUp()
+
+        dom = self.cmpOne("hup")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 14) == 1
+
+        dom = self.cmpOne("int")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 19) == 1
+
+        dom = self.cmpOne("quit")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 24) == 1
+
+        dom = self.cmpOne("bus")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 44) == 1
+
+        dom = self.cmpOne("fpe")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 49) == 1
+
+        dom = self.cmpOne("term")
+        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 84) == 1
+
+class signals(SignalsBase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #158")
+
+    def runTest(self):
+        self.m_self = ""
+        self.doTest()
+
+class signals_self(SignalsBase):
+
+    def runTest(self):
+        self.m_self = "self"
+        self.doTest()
+
+class signals_crash(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals segv self", False)
+        assert b"kcov: Process exited with signal 11" in o
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals abrt self", False)
+        assert b"kcov: Process exited with signal 6" in o
+
+class collect_and_report_only(testbase.KcovTestCase):
+    # Cannot work with combined Engine / Parser
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/main-tests ", False)
+        rv,o = self.do(testbase.kcov + " --collect-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests", False)
+        assert rv == noKcovRv
+
+        try:
+            dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
+            self.fail("File unexpectedly found")
+        except:
+            # Exception is expected here
+            pass
+
+        rv,o = self.do(testbase.kcov + " --report-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+class setpgid_kill(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.testbuild + "/setpgid-kill", False)
+        assert b"SUCCESS" in o
+        rv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/setpgid-kill", False)
+        assert b"SUCCESS" in o
+
+class attach_process_with_threads(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.sources + "/tests/daemon/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/issue31", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/issue31/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 28) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 11) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 9) == 0
+
+class attach_process_with_threads_creates_threads(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.sources + "/tests/daemon/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/thread-test", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/thread-test/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "thread-main.c", 21) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "thread-main.c", 9) >= 1
+
+class merge_same_file_in_multiple_binaries(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_1", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/multi_1/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main_1.c", 10) == 0
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_2", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main_2.c", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 8) == 0
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_2 1", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
+        assert parse_cobertura.hitsPerLine(dom, "file.c", 8) == 1
+
+
+class debuglink(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    def runTest(self):
+        self.setUp()
+        os.system("rm -rf %s/.debug" % (testbase.outbase))
+        os.system("cp %s/main-tests %s/main-tests-debug-file" % (testbase.testbuild, testbase.testbuild))
+        os.system("objcopy --only-keep-debug %s/main-tests-debug-file %s/main-tests-debug-file.debug" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file1.debug" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file12.debug" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file123.debug" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file1" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file2" % (testbase.testbuild, testbase.testbuild))
+        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file3" % (testbase.testbuild, testbase.testbuild))
+        os.system("strip -g %s/main-tests-debug-file" % (testbase.testbuild))
+        os.system("strip -g %s/main-tests-debug-file1" % (testbase.testbuild))
+        os.system("strip -g %s/main-tests-debug-file2" % (testbase.testbuild))
+        os.system("strip -g %s/main-tests-debug-file3" % (testbase.testbuild))
+        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file.debug %s/main-tests-debug-file" % (testbase.testbuild, testbase.testbuild))
+        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file1.debug %s/main-tests-debug-file1" % (testbase.testbuild, testbase.testbuild))
+        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file12.debug %s/main-tests-debug-file2" % (testbase.testbuild, testbase.testbuild))
+        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file123.debug %s/main-tests-debug-file3" % (testbase.testbuild, testbase.testbuild))
+
+        noKcovRv,o = self.do(testbase.testbuild + "/main-tests-debug-file", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
+        assert rv == noKcovRv
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+        # Check alignment
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file1", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file1/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file2", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file2/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file3", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file3/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+        # Look in .debug
+        os.system("rm -rf %s/kcov" % (testbase.outbase))
+        os.system("mkdir -p %s/.debug" % (testbase.testbuild))
+        os.system("mv %s/main-tests-debug-file.debug %s/.debug" % (testbase.testbuild, testbase.testbuild))
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+
+        os.system("rm -rf %s/kcov" % (testbase.outbase))
+        os.system("echo 'abc' >> %s/.debug/main-tests-debug-file.debug" % (testbase.testbuild))
+
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == None
+	# Todo: Look in /usr/lib/debug as well
+
+class collect_no_source(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+
+        os.system("cp %s/tests/short-file.c %s/main.cc" % (testbase.sources, testbase.testbuild))
+        os.system("gcc -g -o %s/main-collect-only %s/main.cc" % (testbase.testbuild, testbase.testbuild))
+        os.system("mv %s/main.cc %s/tmp-main.cc" % (testbase.testbuild, testbase.testbuild))
+
+        rv,o = self.do(testbase.kcov + " --collect-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-collect-only", False)
+
+        os.system("mv %s/tmp-main.cc %s/main.cc" % (testbase.testbuild, testbase.testbuild))
+        rv,o = self.do(testbase.kcov + " --report-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-collect-only")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-collect-only/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 1) == 1
+
+class dlopen(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/dlopen", False)
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/dlopen", False)
+
+        assert noKcovRv == rv
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dlopen/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "dlopen.cc", 11) == 1
+        assert parse_cobertura.hitsPerLine(dom, "dlopen.cc", 12) == 0
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 12) == 0
+
+
+class dlopen_in_ignored_source_file(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --exclude-pattern=dlopen.cc " + testbase.outbase + "/kcov " + testbase.testbuild + "/dlopen", False)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dlopen/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "dlopen-main.cc", 10) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "solib.c", 12) == 0
+
+class daemon_no_wait_for_last_child(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.testbuild + "/test_daemon", False)
+        rv,o = self.do(testbase.kcov + " --output-interval=1 --exit-first-process " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_daemon", False)
+
+        assert noKcovRv == rv
+        time.sleep(2)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 0
+
+        time.sleep(5)
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 1
+
+
+class address_sanitizer_coverage(testbase.KcovTestCase):
+    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        if (not os.path.isfile(testbase.testbuild + "/sanitizer-coverage")):
+            print("Clang-only")
+            assert False
+        rv,o = self.do(testbase.kcov + " --clang " + testbase.outbase + "/kcov " + testbase.testbuild + "/sanitizer-coverage", False)
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/sanitizer-coverage/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 5) == 1
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 7) == 1
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 8) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 16) == 1
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 18) == 1
+
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 22) == 0
+        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 25) == 0
diff --git a/kcov-38/tests/tools/dummy-python.sh b/kcov-38/tests/tools/dummy-python.sh
new file mode 100755
index 000000000000..cb7288c265fc
--- /dev/null
+++ b/kcov-38/tests/tools/dummy-python.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 99
diff --git a/kcov-38/tests/tools/filter.py b/kcov-38/tests/tools/filter.py
new file mode 100644
index 000000000000..4a80eee032f8
--- /dev/null
+++ b/kcov-38/tests/tools/filter.py
@@ -0,0 +1,44 @@
+import testbase
+import unittest
+import parse_cobertura
+
+class include_exclude_pattern(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --exclude-pattern=first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
+
+        rv,o = self.do(testbase.kcov + " --include-pattern=first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
+
+        rv,o = self.do(testbase.kcov + " --include-pattern=first-dir --exclude-pattern=c.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
+        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) >= 1
+
+
+class include_path(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --include-path=" + testbase.sources + "/tests/bash/first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) >= 1
+
+class include_path_and_exclude_pattern(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --include-path=" + testbase.sources + "/tests/bash/first-dir --exclude-pattern=b.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
+        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
+        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) == None
diff --git a/kcov-38/tests/tools/parse_cobertura.py b/kcov-38/tests/tools/parse_cobertura.py
new file mode 100755
index 000000000000..9fdd8ee1be1b
--- /dev/null
+++ b/kcov-38/tests/tools/parse_cobertura.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+import sys
+import xml.dom.minidom
+
+#all these imports are standard on most modern python implementations
+
+def readFile(name):
+    f = open(name,'r')
+    data = f.read()
+    f.close()
+
+    return data
+
+
+def lookupClassName(dom, name):
+    tags = dom.getElementsByTagName('class')
+
+    for tag in tags:
+        nameAttr = tag.attributes["name"]
+        if nameAttr.value == name:
+            return tag
+
+    return None
+
+def lookupHitsByLine(classTag, lineNr):
+    tags = classTag.getElementsByTagName('line')
+
+    for tag in tags:
+        numberAttr = tag.attributes["number"]
+        if int(numberAttr.value) == int(lineNr):
+            hitsAttr = tag.attributes["hits"]
+            return int(hitsAttr.value)
+
+    return None
+
+
+def parse(data):
+    #parse the xml you got from the file
+    dom = xml.dom.minidom.parseString(data)
+
+    return dom
+
+def parseFile(filename):
+    #parse the xml you got from the file
+    dom = xml.dom.minidom.parseString(readFile(filename))
+
+    return dom
+
+def hitsPerLine(dom, fileName, lineNr):
+    fileName = fileName.replace(".", "_").replace("-", "_")
+
+    fileTag = lookupClassName(dom, fileName)
+
+    if fileTag != None:
+        hits = lookupHitsByLine(fileTag, lineNr)
+        if hits != None:
+            return hits
+
+    return None
+
+if __name__ == "__main__":
+    if len(sys.argv) < 4:
+        print("Usage: lookup-class-line <in-file> <filename> <lineNr>")
+        sys.exit(1)
+
+
+    fileName = sys.argv[2]
+    line = int(sys.argv[3])
+
+    data = readFile(sys.argv[1])
+
+    dom = parse(data)
+    fileTag = lookupClassName(dom, fileName)
+
+    if fileTag != None:
+        hits = lookupHitsByLine(fileTag, line)
+        if hits != None:
+            print(hits)
+            sys.exit(0)
+
+    print("nocode")
diff --git a/kcov-38/tests/tools/python.py b/kcov-38/tests/tools/python.py
new file mode 100644
index 000000000000..eee81a11ce8f
--- /dev/null
+++ b/kcov-38/tests/tools/python.py
@@ -0,0 +1,111 @@
+import testbase
+import unittest
+import parse_cobertura
+
+class python_exit_status(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        noKcovRv,o = self.do(testbase.sources + "/tests/python/main 5")
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        assert rv == noKcovRv
+
+class python_can_set_illegal_parser(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --python-parser=python7 " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        assert b"Cannot find Python parser 'python7'" in o
+
+class python_can_set_legal_parser(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --python-parser=python3 " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        assert b"Cannot find Python parser 'python3'" not in o
+
+class python_unittest(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/unittest/testdriver")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/testdriver/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "testdriver", 14) == 1
+
+class python_short_file(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/short-test.py")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/short-test.py/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "short-test.py", 6) == 1
+
+class PythonBase(testbase.KcovTestCase):
+    def doTest(self, extra):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + extra + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 2
+        assert parse_cobertura.hitsPerLine(dom, "main", 17) == 0
+        assert parse_cobertura.hitsPerLine(dom, "main", 22) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 2) == 1
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 4) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 11) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 31) == 0
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 38) == 1
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 39) == 0
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 40) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 41) == 1
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 56) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 60) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 65) == None
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 77) == None
+
+class python_coverage(PythonBase):
+    def runTestTest(self):
+        self.doTest("")
+
+class python_accumulate_data(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 0
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
+
+
+class python3_coverage(PythonBase):
+    def runTest(self):
+        self.doTest("--python-parser=python3")
+
+class python_tricky_single_line_string_assignment(testbase.KcovTestCase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 34) == 2
+
+class python_select_parser(testbase.KcovTestCase):
+    def disabledTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --python-parser=" + testbase.sources + "/tests/tools/dummy-python.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        assert rv == 99
+
+class python_tricky_single_dict_assignment(testbase.KcovTestCase):
+    @unittest.expectedFailure
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 57) == 1
+        assert parse_cobertura.hitsPerLine(dom, "second.py", 61) == 1
diff --git a/kcov-38/tests/tools/run-tests b/kcov-38/tests/tools/run-tests
new file mode 100755
index 000000000000..58a3119fa0df
--- /dev/null
+++ b/kcov-38/tests/tools/run-tests
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+import sys
+import unittest
+import testbase
+
+# The actual tests
+from basic import *
+from compiled import *
+if sys.platform.startswith("linux"):
+    from bash_linux_only import *
+    from system_mode import *
+from filter import *
+from accumulate import *
+from python import *
+from bash import *
+
+if __name__ == "__main__":
+    if len(sys.argv) < 5:
+        print("Usage: run-tests <path-to-kcov-binary> <kcov-output> <path-to-test-builds> <path-to-kcov-source>")
+        sys.exit(1)
+
+    testbase.configure(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
+
+    sys.argv = sys.argv[4:]
+
+    unittest.main()
diff --git a/kcov-38/tests/tools/system_mode.py b/kcov-38/tests/tools/system_mode.py
new file mode 100644
index 000000000000..6831dbbdd043
--- /dev/null
+++ b/kcov-38/tests/tools/system_mode.py
@@ -0,0 +1,68 @@
+import testbase
+import os
+import time
+import unittest
+import platform
+import parse_cobertura
+
+class SystemModeBase(testbase.KcovTestCase):
+    def writeToPipe(self, str):
+        f = open("/tmp/kcov-system.pipe", "w")
+        f.write(str)
+        f.close()
+
+class system_mode_can_start_and_stop_daemon(SystemModeBase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov_system_daemon + " -d", False)
+
+        pf = "/tmp/kcov-system.pid"
+        assert os.path.isfile(pf)
+
+        self.writeToPipe("STOPME")
+
+        time.sleep(2)
+
+        assert os.path.isfile(pf) == False
+
+class system_mode_can_instrument_binary(SystemModeBase):
+    def runTest(self):
+        self.setUp()
+        rv,o = self.do(testbase.kcov + " --system-record " + testbase.outbase + "/kcov " + testbase.testbuild + "/")
+        assert rv == 0
+
+        src = testbase.testbuild + "/main-tests"
+        dst = testbase.outbase + "/kcov/main-tests"
+
+        assert os.path.isfile(src)
+        assert os.path.isfile(dst)
+
+        assert os.path.getsize(dst) > os.path.getsize(src)
+
+class system_mode_can_record_and_report_binary(SystemModeBase):
+    @unittest.skipIf(platform.machine() == "i686", "x86_64-only")
+    def runTest(self):
+        print(platform.machine())
+        self.setUp()
+        try:
+            os.makedirs(testbase.outbase + "/kcov")
+        except:
+            pass
+        rv,o = self.do(testbase.kcov + " --system-record " + testbase.outbase + "/kcov " + testbase.testbuild + "/")
+
+        rv,o = self.do(testbase.kcov_system_daemon + " -d", False)
+
+        os.environ["LD_LIBRARY_PATH"] = testbase.outbase + "/kcov/lib"
+        rv,o = self.do(testbase.outbase + "/kcov/main-tests", False)
+        assert rv == 0
+
+        time.sleep(3)
+        self.writeToPipe("STOPME")
+
+        rv,o = self.do(testbase.kcov + " --system-report " + testbase.outbase + "/kcov-report /tmp/kcov-data")
+        assert rv == 0
+
+        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov-report/main-tests/cobertura.xml")
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 14) == None
+        assert parse_cobertura.hitsPerLine(dom, "main.cc", 18) >= 1
diff --git a/kcov-38/tests/tools/testbase.py b/kcov-38/tests/tools/testbase.py
new file mode 100644
index 000000000000..d70ecc8b6ab0
--- /dev/null
+++ b/kcov-38/tests/tools/testbase.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+
+import unittest
+import os
+import sys
+import subprocess
+import time
+import threading
+
+kcov = ""
+kcov_system_daemon = ""
+outbase = ""
+testbuild = ""
+sources = ""
+
+def configure(k, o, t, s):
+    global kcov, outbase, testbuild, sources, kcov_system_daemon
+    kcov = k
+    kcov_system_daemon = k + "-system-daemon"
+    outbase = o
+    testbuild = t
+    sources = s
+
+class KcovTestCase(unittest.TestCase):
+    def setUp(self):
+        if outbase != "":
+            os.system("rm -rf %s/kcov" % (outbase))
+        os.system("mkdir -p %s/kcov/" % (outbase))
+
+    def doShell(self, cmdline):
+        child = subprocess.Popen(cmdline, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = child.communicate()
+        output = out + err
+        rv = child.returncode
+
+        return rv, output
+
+    def do(self, cmdline, kcovKcov = True, timeout = None):
+        output = ""
+        rv = 0
+
+        extra = ""
+        if kcovKcov and sys.platform.startswith("linux"):
+            extra = kcov + " --include-pattern=kcov --exclude-pattern=helper.cc,library.cc,html-data-files.cc " + outbase + "/kcov-kcov "
+
+
+        cmdline = extra + cmdline
+        child = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        timer = None
+
+        if timeout is not None:
+            def stopChild():
+                print("\n  didn't finish within %s seconds; killing ..." % timeout)
+                child.terminate()
+
+            timer = threading.Timer(timeout, stopChild)
+            timer.start()
+
+        out, err = child.communicate()
+        if timer is not None:
+            timer.cancel()
+        output = out + err
+        rv = child.returncode
+
+        return rv, output
diff --git a/kcov-38/tests/unit-tests/CMakeLists.txt b/kcov-38/tests/unit-tests/CMakeLists.txt
new file mode 100644
index 000000000000..979cc356a9c7
--- /dev/null
+++ b/kcov-38/tests/unit-tests/CMakeLists.txt
@@ -0,0 +1,126 @@
+cmake_minimum_required (VERSION 2.8.4)
+project (kcov-unit-tests)
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
+
+if (POLICY CMP0042)
+    # MACOSX_RPATH is enabled by default.
+    cmake_policy (SET CMP0042 NEW)
+endif (POLICY CMP0042)
+
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set (CMAKE_BUILD_TYPE Debug CACHE STRING
+        "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
+        FORCE
+    )
+    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
+        STRINGS None Debug Release RelWithDebInfo MinSizeRel
+    )
+endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+
+find_package (LibCRPCUT REQUIRED)
+find_package (LibElf REQUIRED)
+find_package (Elfutils REQUIRED)
+
+set (CMAKE_THREAD_PREFER_PTHREAD ON)
+find_package (Threads REQUIRED)
+
+find_package (ZLIB REQUIRED)
+
+find_library (DL_LIBRARY NAMES dl)
+if (DL_LIBRARY)
+    message (STATUS "Found DL: ${DL_LIBRARY}")
+else (DL_LIBRARY)
+    message (FATAL_ERROR "Could NOT find DL")
+endif (DL_LIBRARY)
+
+set (TGT ut)
+
+set (${TGT}_SRCS
+    ../../src/capabilities.cc
+    ../../src/collector.cc
+    ../../src/engine-factory.cc
+    ../../src/engines/system-mode-file-format.cc
+    ../../src/gcov.cc
+    ../../src/output-handler.cc
+    ../../src/parser-manager.cc
+    ../../src/source-file-cache.cc
+    ../../src/system-mode/registration.cc
+    ../../src/system-mode/file-data.cc
+    ../../src/utils.cc
+    ../../src/writers/cobertura-writer.cc
+    ../../src/writers/html-writer.cc
+    ../../src/writers/writer-base.cc
+    main.cc
+    tests-collector.cc
+    tests-configuration.cc
+    tests-elf.cc
+    tests-filter.cc
+    tests-reporter.cc
+    tests-system-mode.cc
+    tests-utils.cc
+    tests-writer.cc
+)
+
+set (CMAKE_CXX_FLAGS "-std=c++1y -Wall -D_GLIBCXX_USE_NANOSLEEP")
+
+
+add_custom_command(OUTPUT html-data-files.cc
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../src/bin-to-c-source.py"
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/bcov.css" css_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/amber.png" icon_amber
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/glass.png" icon_glass
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/source-file.html" source_file_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/index.html" index_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/handlebars.js" handlebars_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/kcov.js" kcov_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.min.js" jquery_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.min.js" tablesorter_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.widgets.min.js" tablesorter_widgets_text
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/tablesorter-theme.css" tablesorter_theme_text
+       > html-data-files.cc
+    DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/bcov.css"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/amber.png"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/glass.png"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/source-file.html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/index.html"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/handlebars.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/kcov.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.widgets.min.js"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/tablesorter-theme.css"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../src/bin-to-c-source.py"
+)
+
+include_directories(
+    ../../src/include/
+    trompeloeil/include
+    ${LIBCRPCUT_INCLUDE_DIRS}
+    ${LIBELF_INCLUDE_DIRS}
+    ${LIBDW_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+)
+
+add_executable (${TGT} ${${TGT}_SRCS} html-data-files.cc)
+
+target_link_libraries(${TGT}
+    ${CMAKE_THREAD_LIBS_INIT}
+    "${DL_LIBRARY}"
+    ${LIBCRPCUT_LIBRARIES}
+    ${LIBDW_LIBRARIES}
+    ${LIBELF_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+)
+
+add_executable (same-name-test
+    ../main.cc
+    ../subdir/file.c
+    ../subdir2/file.c
+)
+
+add_executable (test-binary test-source.c second-source.c)
+set_target_properties(test-binary PROPERTIES
+    COMPILE_FLAGS "-nostdinc"
+    LINK_FLAGS "-nostdlib"
+)
diff --git a/kcov-38/tests/unit-tests/main.cc b/kcov-38/tests/unit-tests/main.cc
new file mode 100644
index 000000000000..03e2f6558b95
--- /dev/null
+++ b/kcov-38/tests/unit-tests/main.cc
@@ -0,0 +1,11 @@
+#include "test.hh"
+#include "mocks/mock-engine.hh"
+
+using namespace kcov;
+
+const char *kcov_version = "0";
+
+int main(int argc, const char *argv[])
+{
+	return crpcut::run(argc, argv);
+}
diff --git a/kcov-38/tests/unit-tests/mocks/mock-collector.hh b/kcov-38/tests/unit-tests/mocks/mock-collector.hh
new file mode 100644
index 000000000000..17aaf400b6cd
--- /dev/null
+++ b/kcov-38/tests/unit-tests/mocks/mock-collector.hh
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "../test.hh"
+
+#include <collector.hh>
+#include <string>
+
+class MockCollector : public kcov::ICollector
+{
+public:
+	MAKE_MOCK1(registerListener, void(kcov::ICollector::IListener &listener));
+	MAKE_MOCK1(registerEventTickListener, void(kcov::ICollector::IEventTickListener &listener));
+	MAKE_MOCK0(prepare, int());
+	MAKE_MOCK1(run, int(const std::string &));
+	MAKE_MOCK0(stop, void());
+
+	void mockRegisterListener(IListener &listener)
+	{
+		m_listener = &listener;
+	}
+
+	IListener *m_listener;
+};
diff --git a/kcov-38/tests/unit-tests/mocks/mock-engine.hh b/kcov-38/tests/unit-tests/mocks/mock-engine.hh
new file mode 100644
index 000000000000..9c8f93a70a6a
--- /dev/null
+++ b/kcov-38/tests/unit-tests/mocks/mock-engine.hh
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../test.hh"
+
+#include <engine.hh>
+
+using namespace kcov;
+
+
+class MockEngine : public IEngine
+{
+public:
+	MockEngine()
+	{
+	}
+
+	MAKE_MOCK1(registerBreakpoint, int(unsigned long addr));
+	MAKE_MOCK2(start, bool(IEventListener &listener, const std::string &executable));
+	MAKE_MOCK0(continueExecution, bool());
+	MAKE_MOCK1(kill, void(int));
+
+	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
+	{
+		return match_perfect;
+	}
+};
diff --git a/kcov-38/tests/unit-tests/mocks/mock-reporter.hh b/kcov-38/tests/unit-tests/mocks/mock-reporter.hh
new file mode 100644
index 000000000000..ba0f3c7f18c4
--- /dev/null
+++ b/kcov-38/tests/unit-tests/mocks/mock-reporter.hh
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <reporter.hh>
+
+namespace kcov
+{
+	class MockReporter : public IReporter
+	{
+	public:
+		MAKE_MOCK1(fileIsIncluded,
+				bool(const std::string &file));
+
+		MAKE_MOCK2(lineIsCode,
+				bool(const std::string &file, unsigned int lineNr));
+
+		MAKE_MOCK2(getLineExecutionCount,
+				LineExecutionCount(const std::string &file, unsigned int lineNr));
+
+		MAKE_MOCK0(getExecutionSummary,
+				ExecutionSummary());
+
+		MAKE_MOCK1(registerListener, void(kcov::IReporter::IListener &listener));
+
+		MAKE_MOCK1(marshal, void *(size_t *szOut));
+
+		MAKE_MOCK2(unMarshal, bool(void *data, size_t sz));
+
+		MAKE_MOCK0(writeCoverageDatabase, void());
+
+		void *mockMarshal(size_t *outSz)
+		{
+			void *out = malloc(32);
+
+			*outSz = 32;
+
+			return out;
+		}
+	};
+}
diff --git a/kcov-38/tests/unit-tests/second-source.c b/kcov-38/tests/unit-tests/second-source.c
new file mode 100644
index 000000000000..6f033d760a21
--- /dev/null
+++ b/kcov-38/tests/unit-tests/second-source.c
@@ -0,0 +1,8 @@
+int mibb(int a)
+{
+	// "Hej" and 'hej' means HTML escaping! \ is another escape
+	if (a < 5 && a > 3)
+		return 0;
+
+	return a - 1;
+}
diff --git a/kcov-38/tests/unit-tests/test-source.c b/kcov-38/tests/unit-tests/test-source.c
new file mode 100644
index 000000000000..e47c5c187cb1
--- /dev/null
+++ b/kcov-38/tests/unit-tests/test-source.c
@@ -0,0 +1,20 @@
+// Small dummy test program to keep the addresses few!
+int kalle(int a, int b)
+{
+	if (a == 15)
+		return 1;
+
+	// Should be two blocks
+	if (a == 10 && b == 19)
+		return 2;
+
+	return 0;
+}
+
+void _start(int a, int b)
+{
+	if (kalle(a, b))
+		return;
+
+	kalle(9, 5);
+}
diff --git a/kcov-38/tests/unit-tests/test.hh b/kcov-38/tests/unit-tests/test.hh
new file mode 100644
index 000000000000..af0759c7281d
--- /dev/null
+++ b/kcov-38/tests/unit-tests/test.hh
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "trompeloeil.hpp"
+#include <crpcut.hpp>
+
+using trompeloeil::_;
diff --git a/kcov-38/tests/unit-tests/tests-collector.cc b/kcov-38/tests/unit-tests/tests-collector.cc
new file mode 100644
index 000000000000..d0a373c76486
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-collector.cc
@@ -0,0 +1,87 @@
+#include "test.hh"
+#include "mocks/mock-engine.hh"
+
+#include <file-parser.hh>
+#include <collector.hh>
+#include <filter.hh>
+#include <utils.hh>
+
+#include <string>
+
+using namespace kcov;
+
+class MockCollectorListener : public ICollector::IListener
+{
+public:
+	virtual ~MockCollectorListener()
+	{
+	}
+
+	MAKE_MOCK2(onAddressHit, void(uint64_t addr, unsigned long hits));
+};
+
+DISABLED_TEST(collector)
+{
+	MockEngine engine;
+	MockCollectorListener listener;
+	IFileParser *elf;
+	char filename[1024];
+	bool res;
+
+	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(elf);
+
+	ICollector &collector = ICollector::create(*elf, engine, IFilter::create());
+
+	collector.registerListener(listener);
+
+	REQUIRE_CALL(engine, registerBreakpoint(_))
+		.TIMES(AT_LEAST(1))
+		.RETURN(0)
+		;
+
+	res = elf->parse();
+	ASSERT_TRUE(res);
+
+	int v;
+
+	REQUIRE_CALL(engine, start(_,_))
+		.TIMES(1)
+		.RETURN(true)
+		;
+
+	IEngine::Event evExit, evOnce;
+
+	evExit.addr = 0;
+	evExit.type = ev_exit;
+	evExit.data = 1;
+
+	evOnce.addr = 1;
+	evOnce.type = ev_breakpoint;
+	evOnce.data = 1;
+
+	REQUIRE_CALL(listener, onAddressHit(1, _))
+		.TIMES(1)
+		;
+
+	v = collector.run(filename);
+
+	ASSERT_EQ(v, evExit.data);
+
+	evOnce.type = ev_error;
+
+	// Test error
+	REQUIRE_CALL(engine, start(_,_))
+		.TIMES(1)
+		.RETURN(0)
+		;
+
+	REQUIRE_CALL(engine, continueExecution())
+		.TIMES(1)
+		.RETURN(true)
+		;
+	v = collector.run(filename);
+
+	ASSERT_EQ(v, -1);
+}
diff --git a/kcov-38/tests/unit-tests/tests-configuration.cc b/kcov-38/tests/unit-tests/tests-configuration.cc
new file mode 100644
index 000000000000..456b7b9ca7e3
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-configuration.cc
@@ -0,0 +1,150 @@
+#include "test.hh"
+
+#include <configuration.hh>
+#include <utils.hh>
+
+#include "../../src/configuration.cc"
+
+static bool runParse(std::string args)
+{
+	char *p = strdup(args.c_str());
+	char *cur;
+	std::list<std::string> argList;
+
+	argList.push_back(std::string(crpcut::get_start_dir()) + "/test-binary");
+
+	cur = strtok(p, " ");
+	while (cur)
+	{
+		argList.push_back(std::string(cur));
+		cur = strtok(NULL, " ");
+	}
+	free((void *)p);
+
+	const char **argv = (const char **)malloc(argList.size() * sizeof(const char*));
+
+	int i = 0;
+	for (std::list<std::string>::iterator it = argList.begin();
+			it != argList.end();
+			it++)
+	{
+		// Yes, these are memory leaks.
+		argv[i] = strdup((*it).c_str());
+		i++;
+	}
+
+	return IConfiguration::getInstance().parse(argList.size(), argv);
+}
+
+TESTSUITE(configuration)
+{
+	DISABLED_TEST(basic)
+	{
+		std::string filename = std::string(crpcut::get_start_dir()) + "/test-binary";
+
+		Configuration *conf = &(Configuration &)Configuration::getInstance();
+		ASSERT_TRUE(conf);
+
+
+		bool res = runParse(fmt("/tmp/vobb %s tjena", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		const char **a = conf->getArgv();
+		ASSERT_TRUE(filename == a[0]);
+		ASSERT_TRUE(std::string("tjena") == a[1]);
+
+		ASSERT_TRUE(conf->keyAsString("binary-name") == "test-binary");
+		ASSERT_TRUE(conf->keyAsString("binary-path") == std::string(crpcut::get_start_dir()) + "/");
+
+		res = runParse("-h");
+		ASSERT_FALSE(res);
+
+		res = runParse("-s vbb");
+		ASSERT_FALSE(res);
+
+		ASSERT_TRUE(conf->keyAsInt("low-limit") == 25);
+		ASSERT_TRUE(conf->keyAsInt("high-limit")== 75U);
+
+		res = runParse(fmt("-l 30,60 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		ASSERT_TRUE(conf->keyAsInt("low-limit")== 30);
+		ASSERT_TRUE(conf->keyAsInt("high-limit") == 60);
+
+		res = runParse(fmt("-l 20 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(!res);
+
+		res = runParse(fmt("-l 40,50,90 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(!res);
+
+		res = runParse(fmt("-l 35,hej /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(!res);
+
+		res = runParse(fmt("-l yo,89 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(!res);
+
+		res = runParse(fmt("/tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		res = runParse(fmt("/tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		res = runParse(fmt("--path-strip-level=ejNummer /tmp/vobb, %s", filename.c_str()));
+		ASSERT_FALSE(res);
+
+		res = runParse(fmt("--path-strip-level=3 /tmp/vobb, %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		res = runParse(fmt("--include-path=/a,/b/c --exclude-pattern=d/e/f /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		ASSERT_TRUE(conf->keyAsList("include-path").size() == 2U);
+		ASSERT_TRUE(conf->keyAsList("include-path")[0] == "/a");
+		ASSERT_TRUE(conf->keyAsList("include-path")[1] == "/b/c");
+
+		ASSERT_TRUE(conf->keyAsList("exclude-pattern").size() == 1U);
+		ASSERT_TRUE(conf->keyAsList("exclude-pattern")[0] == "d/e/f");
+		
+		res = runParse(fmt("--strip-path=path"));
+		ASSERT_TRUE(res);
+		
+		ASSERT_TRUE(conf->keyAsString("strip-path") == "path");
+
+		res = runParse(fmt("--include-path=~/a /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		ASSERT_TRUE(conf->keyAsList("include-path").size() == 1U);
+		ASSERT_TRUE(conf->keyAsList("include-path")[0] == fmt("%s/a", get_home()));
+
+		ASSERT_TRUE(conf->keyAsInt("attach-pid") == 0U);
+		res = runParse(fmt("-p ejNummer /tmp/vobb %s", filename.c_str()));
+		ASSERT_FALSE(res);
+
+		res = runParse(fmt("-p 10 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		res = runParse(fmt("--pid=100 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+		ASSERT_TRUE(conf->keyAsInt("attach-pid") == 100U);
+
+		ASSERT_TRUE(g_kcov_debug_mask == STATUS_MSG);
+		res = runParse(fmt("--debug=7 /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+		ASSERT_TRUE(g_kcov_debug_mask == 7);
+
+		res = runParse(fmt("--exclude-pattern=a /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+
+		auto ep = conf->keyAsList("exclude-pattern");
+		ASSERT_TRUE(ep.size() == 1);
+		ASSERT_TRUE(ep[0] == "a");
+
+		res = runParse(fmt("--include-pattern=a,b,c /tmp/vobb %s", filename.c_str()));
+		ASSERT_TRUE(res);
+		ep = conf->keyAsList("include-pattern");
+		ASSERT_TRUE(ep.size() == 3);
+		ASSERT_TRUE(ep[0] == "a");
+		ASSERT_TRUE(ep[1] == "b");
+		ASSERT_TRUE(ep[2] == "c");
+	}
+}
diff --git a/kcov-38/tests/unit-tests/tests-elf.cc b/kcov-38/tests/unit-tests/tests-elf.cc
new file mode 100644
index 000000000000..bfedc9ddb387
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-elf.cc
@@ -0,0 +1,68 @@
+#include "test.hh"
+
+#include <file-parser.hh>
+#include <utils.hh>
+
+#include <string>
+#include <string.h>
+
+#include <map>
+
+using namespace kcov;
+
+class FunctionListener : public IFileParser::ILineListener
+{
+public:
+
+	virtual void onLine(const std::string &file, unsigned int lineNr,
+			uint64_t addr)
+	{
+		m_lineMap[constructString(file, lineNr)]++;
+	}
+
+	static std::string constructString(const std::string &file, int nr)
+	{
+		const char *p = file.c_str();
+		char *c_str = (char *)xmalloc(file.size() + 20);
+		const char *name = strrchr(p, '/');
+
+		ASSERT_TRUE(name);
+
+		sprintf(c_str, "%s:%d", name, nr);
+
+		std::string out(c_str);
+		free(c_str);
+
+		return out;
+	}
+
+	std::map<std::string, int> m_lineMap;
+};
+
+DISABLED_TEST(elf, DEADLINE_REALTIME_MS(30000))
+{
+	FunctionListener listener;
+	char filename[1024];
+	bool res;
+
+	IFileParser *elf = IParserManager::getInstance().matchParser("not-found");
+	ASSERT_TRUE(!elf);
+
+	sprintf(filename, "%s/Makefile", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(!elf);
+
+	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(elf);
+
+	elf->registerLineListener(listener);
+
+	res = elf->addFile(filename);
+	ASSERT_TRUE(res == true);
+	res = elf->parse();
+	ASSERT_TRUE(res == true);
+
+	std::string str = FunctionListener::constructString("/test-source.c", 8);
+	ASSERT_TRUE(listener.m_lineMap[str] > 0);
+}
diff --git a/kcov-38/tests/unit-tests/tests-filter.cc b/kcov-38/tests/unit-tests/tests-filter.cc
new file mode 100644
index 000000000000..ce3dcab42026
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-filter.cc
@@ -0,0 +1,85 @@
+#include "test.hh"
+
+#include <configuration.hh>
+#include "../../src/filter.cc"
+
+using namespace kcov;
+
+TEST(filter)
+{
+	std::string filename = std::string(crpcut::get_start_dir()) + "/test-binary";
+
+	IConfiguration &conf = IConfiguration::getInstance();
+	Filter &filter = (Filter &)IFilter::create();
+	bool res;
+	const char *argv[] = {NULL, "/tmp/vobb", filename.c_str(), "tjena"};
+	res = conf.parse(4, argv);
+	ASSERT_TRUE(res);
+	filter.setup();
+
+	res = filter.runFilters("");
+	ASSERT_TRUE(res);
+	res = filter.runFilters(filename);
+	ASSERT_TRUE(res);
+
+
+	const char *argv2[] = {NULL, "--include-pattern=test-bin", "/tmp/vobb", filename.c_str(), "tjena"};
+	res = conf.parse(5, argv2);
+	ASSERT_TRUE(res);
+	filter.setup();
+
+	res = filter.runFilters(filename);
+	ASSERT_TRUE(res);
+	res = filter.runFilters("ingenting");
+	ASSERT_FALSE(res);
+
+
+	const char *argv3[] = {NULL, "--exclude-pattern=hej,hopp", "--include-pattern=bin", "/tmp/vobb", filename.c_str(), "tjena"};
+	res = conf.parse(5, argv3);
+	ASSERT_TRUE(res);
+	filter.setup();
+
+	res = filter.runFilters("binary");
+	ASSERT_TRUE(res);
+	res = filter.runFilters("hopp/binary");
+	ASSERT_FALSE(res);
+	res = filter.runFilters("hej/binary");
+	ASSERT_FALSE(res);
+	res = filter.runFilters("varken-eller");
+	ASSERT_FALSE(res);
+
+	std::string ip = std::string("--include-path=") + crpcut::get_start_dir();
+	const char *argv4[] = {NULL,
+			ip.c_str(),
+			"/tmp/vobb",
+			filename.c_str(), "tjena"};
+	res = conf.parse(5, argv4);
+	ASSERT_TRUE(res);
+	filter.setup();
+
+	res = filter.runFilters(crpcut::get_start_dir());
+	ASSERT_TRUE(res);
+	res = filter.runFilters(filename);
+	ASSERT_TRUE(res);
+	res = filter.runFilters("hejsan-hoppsan");
+	ASSERT_FALSE(res);
+
+	std::string ep = std::string("--exclude-path=") + crpcut::get_start_dir();
+	const char *argv5[] = {NULL,
+			ep.c_str(),
+			"/tmp/vobb",
+			filename.c_str(), "tjena"};
+	res = conf.parse(5, argv5);
+	ASSERT_TRUE(res);
+	filter.setup();
+
+	res = filter.runFilters(crpcut::get_start_dir());
+	ASSERT_FALSE(res);
+	res = filter.runFilters(std::string(crpcut::get_start_dir()) + "/svenne");
+	ASSERT_FALSE(res);
+	res = filter.runFilters("/tmp");
+	ASSERT_TRUE(res);
+
+	res = filter.runLineFilters("Kalle", 15, "Inget speciellt");
+	ASSERT_TRUE(res);
+}
diff --git a/kcov-38/tests/unit-tests/tests-merge-parser.cc b/kcov-38/tests/unit-tests/tests-merge-parser.cc
new file mode 100644
index 000000000000..e839fbdd8ffd
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-merge-parser.cc
@@ -0,0 +1,312 @@
+#include "test.hh"
+
+#include "mocks/mock-reporter.hh"
+#include "../../src/merge-file-parser.cc"
+
+#include <utils.hh>
+#include <string>
+#include <vector>
+
+class MockParser : public IFileParser
+{
+public:
+	MAKE_MOCK2(addFile, bool(const std::string &filename, struct phdr_data_entry *phdr_data));
+	MAKE_MOCK1(registerLineListener, void(ILineListener &listener));
+	MAKE_MOCK1(registerFileListener, void(IFileListener &listener));
+	MAKE_MOCK0(parse, bool());
+	MAKE_MOCK0(getChecksum, uint64_t());
+	MAKE_MOCK0(getParserType, std::string());
+	MAKE_MOCK1(setupParser, void(IFilter *));
+	MAKE_MOCK0(maxPossibleHits, enum IFileParser::PossibleHits());
+	MAKE_MOCK3(matchParser, unsigned int(const std::string &filename, uint8_t *mock_data, size_t dataSize));
+};
+
+static bool mocked_file_exists(const std::string &path)
+{
+	return true;
+}
+
+
+static std::vector<uint8_t> mock_data;
+static void *mocked_read_file(size_t *out_size, const char *path)
+{
+	*out_size = mock_data.size();
+
+	void *p = xmalloc(*out_size);
+	memcpy(p, mock_data.data(), *out_size);
+
+	return p;
+}
+
+static std::unordered_map<std::string, std::string> path_to_data;
+static int mocked_write_file(const void *data, size_t size, const char *path)
+{
+	path_to_data[path] = std::string((const char *)data);
+
+	return 0;
+}
+
+static uint64_t mocked_ts;
+static uint64_t mocked_get_timestamp(const std::string &filename)
+{
+	return mocked_ts;
+}
+
+class LineListenerFixture : public IFileParser::ILineListener
+{
+public:
+	virtual ~LineListenerFixture()
+	{
+	}
+
+	void onLine(const std::string &file, unsigned int lineNr,
+			unsigned long addr)
+	{
+		m_lineToAddr[lineNr] = addr;
+	}
+
+protected:
+	std::unordered_map<unsigned int, unsigned long> m_lineToAddr;
+};
+
+class AddressListenerFixture : public IReporter::IListener, public ICollector::IListener
+{
+public:
+	virtual ~AddressListenerFixture()
+	{
+	}
+
+	void onAddress(uint64_t addr, unsigned long hits)
+	{
+		m_addrToHits[addr] = hits;
+	}
+
+	void onAddressHit(uint64_t addr, unsigned long hits)
+	{
+		m_breakpointToHits[addr] = hits;
+	}
+
+protected:
+	std::unordered_map<unsigned int, unsigned long> m_addrToHits;
+	std::unordered_map<unsigned int, unsigned long> m_breakpointToHits;
+};
+
+
+TESTSUITE(merge_parser)
+{
+	TEST(marshal)
+	{
+		MockParser mockParser;
+		MockReporter reporter;
+		auto &filter = IFilter::create();
+
+		REQUIRE_CALL(mockParser, registerFileListener(_))
+			.TIMES(2)
+		;
+		REQUIRE_CALL(mockParser, registerLineListener(_))
+			.TIMES(2)
+		;
+
+		mock_data = {'a', '\n', 'b', '\n', '\0'};
+		mocked_ts = 1;
+
+		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
+
+		mock_file_exists(mocked_file_exists);
+		mock_read_file(mocked_read_file);
+		mock_get_file_timestamp(mocked_get_timestamp);
+
+		parser.onLine("a", 1, 2);
+		parser.onLine("a", 1, 3); // Two addresses on the same line
+		parser.onLine("a", 2, 3);
+
+		parser.onLine("c", 2, 5);
+
+		const struct file_data *p;
+
+		// Does not exist
+		p = parser.marshalFile("b");
+		ASSERT_TRUE(!p);
+
+		// But this one does
+		p = parser.marshalFile("a");
+		ASSERT_TRUE(p);
+
+		ASSERT_TRUE(be_to_host<uint32_t>(p->magic) == MERGE_MAGIC);
+		ASSERT_TRUE(be_to_host<uint32_t>(p->version) == MERGE_VERSION);
+		ASSERT_TRUE(be_to_host<uint32_t>(p->n_entries) == 2);
+
+		char *name = ((char *)p) + be_to_host<uint32_t>(p->file_name_offset);
+		ASSERT_TRUE(std::string(name) == "a");
+		ASSERT_TRUE(name + strlen(name) + 1 - (char *)p == be_to_host<uint32_t>(p->size));
+
+		ASSERT_TRUE(be_to_host<uint32_t>(p->entries[0].line) == 1);
+		ASSERT_TRUE(be_to_host<uint32_t>(p->entries[0].n_addresses) == 2);
+
+		uint64_t *addressTable = (uint64_t *)((char *)p + be_to_host<uint32_t>(p->address_table_offset));
+		uint32_t start = be_to_host<uint32_t>(p->entries[0].address_start);
+
+		ASSERT_TRUE(be_to_host<uint64_t>(addressTable[start]) == parser.hashAddress("a", 1, 2));
+		ASSERT_TRUE(be_to_host<uint64_t>(addressTable[start + 1]) == parser.hashAddress("a", 1, 3) + 1);
+
+		// No output
+		MergeParser parser2(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
+
+		parser2.onLine("c", 4, 1);
+		// New timestamp for the "a" file
+		mocked_ts = 2;
+		parser2.onLine("a", 1, 2);
+
+		const struct file_data *p2;
+
+		// Test that the checksum changes on new TS
+		p2 = parser2.marshalFile("a");
+		ASSERT_TRUE(p2);
+
+		ASSERT_TRUE(p->checksum == p2->checksum);
+		ASSERT_TRUE(p->timestamp != p2->timestamp);
+
+		// ... but is the same with the old TS
+		p = parser.marshalFile("c");
+		p2 = parser2.marshalFile("c");
+		ASSERT_TRUE(p);
+		ASSERT_TRUE(p2);
+
+		// Should be the same
+		ASSERT_TRUE(p->checksum == p2->checksum);
+		ASSERT_TRUE(p->timestamp == p2->timestamp);
+
+		// Same timestamp, different data
+		parser.onLine("d", 9, 1);
+		mock_data = {'a', '\n', 'b', 'c', '\n', '\0'};
+		parser2.onLine("d", 9, 1);
+
+		p = parser.marshalFile("d");
+		p2 = parser2.marshalFile("d");
+		ASSERT_TRUE(p);
+		ASSERT_TRUE(p2);
+
+		ASSERT_TRUE(p->timestamp == p2->timestamp);
+		ASSERT_TRUE(p->checksum != p2->checksum);
+	}
+
+	TEST(output)
+	{
+		auto &filter = IFilter::create();
+		MockParser mockParser;
+		MockReporter reporter;
+
+		REQUIRE_CALL(mockParser, registerFileListener(_))
+			.TIMES(1)
+		;
+		REQUIRE_CALL(mockParser, registerLineListener(_))
+			.TIMES(1)
+		;
+
+		mock_data = {'a', '\n', 'b', '\n', '\0'};
+		mocked_ts = 1;
+
+		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
+
+		mock_file_exists(mocked_file_exists);
+		mock_read_file(mocked_read_file);
+		mock_write_file(mocked_write_file);
+		mock_get_file_timestamp(mocked_get_timestamp);
+
+		parser.onLine("a", 1, 2);
+		parser.onLine("b", 2, 3);
+
+		parser.onStop();
+
+		std::string p0 = parser.m_outputDirectory + "/metadata/" + fmt("%08x", hash_block("a", 1));
+		std::string p1 = parser.m_outputDirectory + "/metadata/" + fmt("%08x", hash_block("b", 1));
+
+		ASSERT_TRUE(path_to_data.find(p0) != path_to_data.end());
+		ASSERT_TRUE(path_to_data.find(p1) != path_to_data.end());
+	}
+
+	TEST(input, LineListenerFixture, AddressListenerFixture)
+	{
+		auto &filter = IFilter::create();
+		MockParser mockParser;
+		MockReporter reporter;
+
+		REQUIRE_CALL(mockParser, registerFileListener(_))
+			.TIMES(2)
+		;
+		REQUIRE_CALL(mockParser, registerLineListener(_))
+			.TIMES(2)
+		;
+
+		mock_data = {'a', '\n', 'b', '\n', '\0'};
+		mocked_ts = 1;
+
+		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
+
+		mock_file_exists(mocked_file_exists);
+		mock_read_file(mocked_read_file);
+		mock_write_file(mocked_write_file);
+		mock_get_file_timestamp(mocked_get_timestamp);
+
+		// Register the collector address listener
+		parser.registerListener(*this);
+
+		parser.onLine("a", 1, 2);
+		parser.onLine("a", 3, 9);
+		parser.onLine("a", 4, 72);
+		parser.onLine("b", 2, 3);
+
+		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("b", 2, 3)] == 0);
+		parser.onAddress(3, 2);
+		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("b", 2, 3)] == 2);
+
+		// Register afterwards to get everything on parse below...
+		parser.registerLineListener(*this);
+
+		// Non-hash file
+		parser.parseOne("/tmp/kalle/df/", "some-other-file");
+
+		// Non-existing
+		parser.parseOne("/tmp/kalle/df/", "12345678");
+
+		// Existing (but fake, anyway)
+		parser.parseOne("/tmp/kalle/df/",
+				fmt("0x%08x", parser.m_files["a"]->m_checksum));
+
+		const struct file_data *p;
+		p = parser.marshalFile("a");
+		ASSERT_TRUE(p);
+
+		MergeParser parser2(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
+		parser2.registerLineListener(*this);
+		parser2.registerListener(*this);
+
+		// Valid file and data
+		ASSERT_TRUE(m_lineToAddr.size() == 0);
+		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("a", 4, 72)] == 0);
+
+		// See to it that we "know of" file "a"
+		parser2.onLine("a", 4, 72);
+
+		// Mark all entries as executed in the table (should yield hits below)
+		uint64_t *table = (uint64_t*)((const char *)p + be_to_host<uint32_t>(p->address_table_offset));
+
+		for (unsigned int i = 0; i < 4; i++)
+			table[i] = to_be<uint64_t>((be_to_host<uint64_t>(table[i]) | (1ULL << 63)));
+
+		mock_data.clear();
+
+		uint8_t *b = (uint8_t *)p;
+		for (unsigned int i = 0; i < be_to_host<uint32_t>(p->size); i++)
+			mock_data.push_back(b[i]);
+
+
+		parser2.parseOne("/tmp/kalle/df/",
+				fmt("0x%08x", parser.m_files["a"]->m_checksum));
+		ASSERT_TRUE(m_lineToAddr.size() == 3);
+		ASSERT_TRUE(m_lineToAddr[1] == parser.hashAddress("a", 1, 2));
+		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("a", 4, 72)] == 1);
+
+		free((void *)p);
+	}
+}
diff --git a/kcov-38/tests/unit-tests/tests-reporter.cc b/kcov-38/tests/unit-tests/tests-reporter.cc
new file mode 100644
index 000000000000..bdae2b04084a
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-reporter.cc
@@ -0,0 +1,151 @@
+#include "test.hh"
+
+#include <file-parser.hh>
+#include <collector.hh>
+#include <reporter.hh>
+#include <filter.hh>
+#include <utils.hh>
+
+#include <string>
+#include <unordered_map>
+
+#include "../../src/reporter.cc"
+#include "mocks/mock-collector.hh"
+
+using namespace kcov;
+
+class ElfListener : public IFileParser::ILineListener
+{
+public:
+	virtual ~ElfListener()
+	{
+	}
+
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+		// Just store the lastest to have something
+		m_lineToAddr[lineNr] = addr;
+		if (m_file == "")
+			m_file = file;
+	}
+
+	std::string m_file;
+	std::unordered_map<unsigned int, unsigned long> m_lineToAddr;
+};
+
+DISABLED_TEST(reporter)
+{
+	ElfListener elfListener;
+	IFileParser *elf;
+	bool res;
+	char filename[1024];
+
+	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(elf);
+
+	elf->registerLineListener(elfListener);
+
+	MockCollector collector;
+
+	REQUIRE_CALL(collector, registerListener(_))
+		.TIMES(1)
+		.LR_SIDE_EFFECT(collector.mockRegisterListener(_1))
+		;
+
+
+	Reporter &reporter = (Reporter &)IReporter::create(*elf, collector, IFilter::create());
+
+	IReporter::ExecutionSummary summary =
+			reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_lines == 0U);
+	ASSERT_TRUE(summary.m_executedLines == 0U);
+
+	res = elf->addFile(filename);
+	ASSERT_TRUE(res);
+
+	res = elf->parse();
+	ASSERT_TRUE(res);
+
+	summary = reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_lines == 17U); // Executable lines
+	ASSERT_TRUE(summary.m_executedLines == 0U);
+
+
+	// Test something which doesn't exist
+	collector.m_listener->onAddressHit(100, 1);
+
+	summary = reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_executedLines == 0U);
+
+	// See test-source.c
+	IReporter::LineExecutionCount lc =
+			reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
+	ASSERT_TRUE(lc.m_hits == 0U);
+	ASSERT_TRUE(lc.m_possibleHits == 1U);
+
+
+	ASSERT_TRUE(elfListener.m_lineToAddr[8]);
+
+	// and something which does
+	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[19], 1);
+
+	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
+	ASSERT_TRUE(lc.m_hits == 1U);
+	ASSERT_TRUE(lc.m_possibleHits == 1U);
+
+	// Once again (should not happen except on marshalling - this should
+	// not count up the number of hits)
+	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[19], 1);
+	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
+	ASSERT_TRUE(lc.m_hits == 1U);
+
+	summary = reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_executedLines == 1U);
+
+	res = reporter.lineIsCode(elfListener.m_file.c_str(), 19);
+	ASSERT_TRUE(res == true);
+
+	res = reporter.lineIsCode(elfListener.m_file.c_str(), 13);
+	ASSERT_TRUE(res == false);
+
+	// Test marshal and unmarshal
+	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[16], 1);
+
+	summary = reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_executedLines == 2U);
+
+	size_t sz;
+	void *data = reporter.marshal(&sz);
+	ASSERT_TRUE(sz >= 0U);
+	ASSERT_TRUE(data);
+
+	// Happened after, not part of the marshalling
+	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[17], 1);
+
+	summary = reporter.getExecutionSummary();
+	ASSERT_TRUE(summary.m_executedLines == 3U);
+
+	res = reporter.unMarshal(data, sz);
+	ASSERT_TRUE(res);
+	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 16);
+	ASSERT_TRUE(lc.m_hits == 1U);
+	ASSERT_TRUE(lc.m_possibleHits == 1U);
+
+	struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)data;
+	hdr->checksum++;
+	res = reporter.unMarshal(data, sz);
+	ASSERT_FALSE(res);
+	hdr->checksum--;
+
+	hdr->db_version++;
+	res = reporter.unMarshal(data, sz);
+	ASSERT_FALSE(res);
+	hdr->db_version--;
+
+	hdr->magic++;
+	res = reporter.unMarshal(data, sz);
+	ASSERT_FALSE(res);
+
+	free(data);
+}
diff --git a/kcov-38/tests/unit-tests/tests-system-mode.cc b/kcov-38/tests/unit-tests/tests-system-mode.cc
new file mode 100644
index 000000000000..baf172421870
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-system-mode.cc
@@ -0,0 +1,449 @@
+#include "test.hh"
+
+#include <configuration.hh>
+#include <utils.hh>
+
+#include "../../src/engines/system-mode-file-format.hh"
+
+#include <system-mode/file-data.hh>
+#include <system-mode/registration.hh>
+
+using namespace kcov_system_mode;
+using namespace kcov;
+
+TESTSUITE(system_mode_formats)
+{
+	TEST(can_marshal_empty_struct)
+	{
+		class system_mode_memory mem("kalle-anka", "--include-pattern=anka --exclude-pattern=hejbo", 0);
+
+		size_t size;
+		auto file = memoryToFile(mem, size);
+		char *p = (char *)file;
+		ASSERT_TRUE(file);
+
+		ASSERT_TRUE(file->magic == SYSTEM_MODE_FILE_MAGIC);
+		ASSERT_TRUE(file->version == SYSTEM_MODE_FILE_VERSION);
+		ASSERT_TRUE(file->n_entries == 0);
+		ASSERT_TRUE(file->filename_offset == sizeof(*file));
+		ASSERT_TRUE(file->kcov_options_offset == file->filename_offset + mem.filename.size() + 1);
+
+		auto fn = std::string(&p[file->filename_offset]);
+		auto opts = std::string(&p[file->kcov_options_offset]);
+
+		ASSERT_TRUE(fn == "kalle-anka");
+		ASSERT_TRUE(opts == "--include-pattern=anka --exclude-pattern=hejbo");
+	}
+
+	TEST(can_marshal_single_entry_struct)
+	{
+		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
+
+		mem.data[0] = 0x12345678;
+
+		size_t size;
+		auto file = memoryToFile(mem, size);
+		char *p = (char *)file;
+		ASSERT_TRUE(file);
+
+		ASSERT_TRUE(file->n_entries == 1);
+		ASSERT_TRUE(file->data[0] == 0x12345678);
+
+		auto fn = std::string(&p[file->filename_offset]);
+		auto opts = std::string(&p[file->kcov_options_offset]);
+
+		ASSERT_TRUE(fn == "roy-gunnar-ramstedt");
+		ASSERT_TRUE(opts == "moa");
+	}
+
+	TEST(can_marshal_multi_entry_struct)
+	{
+		class system_mode_memory mem("", "simon", 3);
+
+		mem.data[0] = 0x12345678;
+		mem.data[1] = 0x56789abc;
+		mem.data[2] = 0xaabbccdd;
+
+		size_t size;
+		auto file = memoryToFile(mem, size);
+		char *p = (char *)file;
+		ASSERT_TRUE(file);
+
+		ASSERT_TRUE(file->n_entries == 3);
+		ASSERT_TRUE(file->data[0] == 0x12345678);
+		ASSERT_TRUE(file->data[1] == 0x56789abc);
+		ASSERT_TRUE(file->data[2] == 0xaabbccdd);
+
+		auto fn = std::string(&p[file->filename_offset]);
+		auto opts = std::string(&p[file->kcov_options_offset]);
+
+		ASSERT_TRUE(fn == "");
+		ASSERT_TRUE(opts == "simon");
+	}
+
+	TEST(cannot_unmarshal_with_invalid_magic)
+	{
+		struct system_mode_file f{};
+
+		f.magic = SYSTEM_MODE_FILE_MAGIC+1;
+		f.version = SYSTEM_MODE_FILE_VERSION;
+
+		auto mem = fileToMemory(f);
+		ASSERT_FALSE(mem);
+	}
+
+	TEST(cannot_unmarshal_with_invalid_version)
+	{
+		struct system_mode_file f{};
+
+		f.magic = SYSTEM_MODE_FILE_MAGIC;
+		f.version = SYSTEM_MODE_FILE_VERSION + 1;
+
+		auto mem = fileToMemory(f);
+		ASSERT_FALSE(mem);
+	}
+
+	TEST(cannot_unmarshal_with_invalid_string_offsets)
+	{
+		struct system_mode_file f{};
+
+		f.magic = SYSTEM_MODE_FILE_MAGIC;
+		f.version = SYSTEM_MODE_FILE_VERSION;
+
+		f.filename_offset = 0; // Should be atleast sizeof(f)
+
+		auto mem = fileToMemory(f);
+		ASSERT_FALSE(mem);
+
+		f.filename_offset = sizeof(f);
+		f.kcov_options_offset = sizeof(f); // Should be at least + 1
+		mem = fileToMemory(f);
+
+		ASSERT_FALSE(mem);
+	}
+
+	TEST(can_unmarshal_empty_struct)
+	{
+		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) + 2);
+
+		f->magic = SYSTEM_MODE_FILE_MAGIC;
+		f->version = SYSTEM_MODE_FILE_VERSION;
+		f->filename_offset = sizeof(*f);
+		f->kcov_options_offset = f->filename_offset + 1;
+
+		auto mem = fileToMemory(*f);
+		ASSERT_TRUE(mem);
+
+		ASSERT_TRUE(mem->n_entries == 0);
+		ASSERT_TRUE(mem->filename == "");
+		ASSERT_TRUE(mem->options == "");
+	}
+
+	TEST(can_unmarshal_single_entry_struct)
+	{
+		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) +
+				sizeof(uint32_t) +
+				strlen("hej") + strlen("hopp") + 2);
+		char *p = (char *)f;
+
+		f->magic = SYSTEM_MODE_FILE_MAGIC;
+		f->version = SYSTEM_MODE_FILE_VERSION;
+		f->n_entries = 1;
+		f->filename_offset = sizeof(*f) + sizeof(uint32_t);
+		f->kcov_options_offset = f->filename_offset + strlen("hej") + 1;
+		strcpy(&p[f->filename_offset], "hej");
+		strcpy(&p[f->kcov_options_offset], "hopp");
+		f->data[0] = 0x12345678;
+
+
+		auto mem = fileToMemory(*f);
+		ASSERT_TRUE(mem);
+
+		ASSERT_TRUE(mem->filename == "hej");
+		ASSERT_TRUE(mem->options == "hopp");
+		ASSERT_TRUE(mem->n_entries == 1);
+		ASSERT_TRUE(mem->data[0] == 0x12345678);
+	}
+
+	TEST(can_unmarshal_multi_entry_struct)
+	{
+		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) +
+				sizeof(uint32_t) * 3 +
+				strlen("a") + strlen("b") + 2);
+		char *p = (char *)f;
+
+		f->magic = SYSTEM_MODE_FILE_MAGIC;
+		f->version = SYSTEM_MODE_FILE_VERSION;
+		f->n_entries = 3;
+		f->filename_offset = sizeof(*f) + sizeof(uint32_t) * 3;
+		f->kcov_options_offset = f->filename_offset + strlen("hej") + 1;
+		strcpy(&p[f->filename_offset], "a");
+		strcpy(&p[f->kcov_options_offset], "b");
+		f->data[0] = 0x12345678;
+		f->data[1] = 123;
+		f->data[2] = 4711;
+
+
+		auto mem = fileToMemory(*f);
+		ASSERT_TRUE(mem);
+
+		ASSERT_TRUE(mem->filename == "a");
+		ASSERT_TRUE(mem->options == "b");
+		ASSERT_TRUE(mem->n_entries == 3);
+		ASSERT_TRUE(mem->data[0] == 0x12345678);
+		ASSERT_TRUE(mem->data[1] == 123);
+		ASSERT_TRUE(mem->data[2] == 4711);
+	}
+
+	TEST(out_of_bounds_indexes_are_not_hit)
+	{
+		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
+		class system_mode_memory memEmpty("roy-gunnar-ramstedt", "moa", 0);
+
+		// 0..31 are possible
+		ASSERT_FALSE(mem.indexIsHit(32));
+		ASSERT_FALSE(memEmpty.indexIsHit(0));
+	}
+
+	TEST(can_report_single_hit)
+	{
+		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
+
+		mem.reportIndex(1);
+
+		ASSERT_FALSE(mem.indexIsHit(0));
+		ASSERT_TRUE(mem.indexIsHit(1));
+	}
+
+	TEST(can_report_multiple_hits)
+	{
+		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 4);
+
+		for (unsigned i = 0; i < 4 * 32; i += 2)
+		{
+			mem.reportIndex(i);
+		}
+
+		for (unsigned i = 0; i < 4 * 32; i++)
+		{
+			if (i % 2 == 0)
+			{
+				ASSERT_TRUE(mem.indexIsHit(i));
+			}
+			else
+			{
+				ASSERT_FALSE(mem.indexIsHit(i));
+			}
+		}
+	}
+
+	TEST(can_detect_dirtyness)
+	{
+		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 4);
+
+		ASSERT_FALSE(mem.isDirty());
+
+		mem.reportIndex(4 * 32 - 1);
+		ASSERT_TRUE(mem.isDirty());
+
+		mem.markClean();
+		ASSERT_FALSE(mem.isDirty());
+
+		mem.reportIndex(4 * 32 - 2);
+		ASSERT_TRUE(mem.isDirty());
+	}
+}
+
+TESTSUITE(system_mode_file_data)
+{
+	TEST(file_with_no_entries_will_not_have_a_trailer)
+	{
+		uint8_t data[1];
+
+		auto f = SystemModeFile::fromRawFile(1, "", "", (void *)data, sizeof(data));
+		ASSERT_TRUE(f);
+
+		size_t sz;
+		auto processed = f->getProcessedData(sz);
+		ASSERT_TRUE(processed);
+		ASSERT_TRUE(sz == sizeof(data));
+
+		ASSERT_TRUE(f->getOptions() == "");
+		ASSERT_TRUE(f->getFilename() == "");
+
+		ASSERT_TRUE(f->getId() == 1U);
+	}
+
+	TEST(can_add_entries)
+	{
+		uint8_t data[1];
+
+		data[0] = 0xf2;
+
+		auto f = SystemModeFile::fromRawFile(2, "manne.elf", "kalle-anka", (void *)data, sizeof(data));
+		ASSERT_TRUE(f);
+
+		ASSERT_TRUE(f->getFilename() == "manne.elf");
+		ASSERT_TRUE(f->getOptions() == "kalle-anka");
+		ASSERT_TRUE(f->getId() == 2U);
+
+		f->addEntry(0, 0x12345678);
+		f->addEntry(1000, 0x98765432);
+
+		auto entries = f->getEntries();
+		ASSERT_TRUE(entries.size() == 1001);
+		ASSERT_TRUE(entries[0] == 0x12345678);
+		ASSERT_TRUE(entries[1] == 0); // Not set
+		ASSERT_TRUE(entries[1000] == 0x98765432);
+
+		size_t sz;
+		auto processed = f->getProcessedData(sz);
+		ASSERT_TRUE(processed);
+		ASSERT_TRUE(sz > sizeof(data));
+
+		// Verify the actual data
+		ASSERT_TRUE(memcmp(data, processed, sizeof(data)) == 0);
+
+		auto f2 = SystemModeFile::fromProcessedFile(processed, sz);
+		ASSERT_TRUE(f2);
+
+		entries = f2->getEntries();
+
+		// Should be the same as in f
+		ASSERT_TRUE(entries.size() == 1001);
+		ASSERT_TRUE(entries[0] == 0x12345678);
+		ASSERT_TRUE(entries[1] == 0); // Still not set
+		ASSERT_TRUE(entries[1000] == 0x98765432);
+
+		ASSERT_TRUE(f2->getFilename() == "manne.elf");
+		ASSERT_TRUE(f2->getOptions() == "kalle-anka");
+		ASSERT_TRUE(f2->getId() == 2U);
+	}
+
+	TEST(cannot_create_system_mode_file_if_trailer_isnt_8_byte_aligned)
+	{
+		for (unsigned i = 0; i < 7; i++)
+		{
+			uint8_t data[i];
+
+			auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+			ASSERT_FALSE(f);
+		}
+	}
+
+	TEST(cannot_create_system_mode_file_if_options_or_filename_size_isnt_8_byte_aligned)
+	{
+		uint8_t data[sizeof(uint64_t) + sizeof(struct trailer)];
+		struct trailer *trailer = (struct trailer *)&data[sizeof(uint64_t)];
+
+		memset(data, 0, sizeof(data));
+
+		trailer->compressed_size = 0;
+		trailer->uncompressed_size = 0;
+		trailer->options_size = 7;
+		trailer->filename_size = 8;
+		trailer->magic = TRAILER_MAGIC;
+		trailer->version = TRAILER_VERSION;
+		trailer->n_entries = 0;
+
+		auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_FALSE(f);
+
+		trailer->options_size = 15;
+		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_FALSE(f);
+
+		trailer->options_size = 24;
+		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_TRUE(f);
+
+		trailer->filename_size = 7;
+		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_FALSE(f);
+	}
+
+	TEST(cannot_create_system_mode_file_if_trailer_magic_or_version_is_wrong)
+	{
+		uint8_t data[sizeof(uint64_t) * 2 + sizeof(struct trailer)];
+		struct trailer *trailer = (struct trailer *)&data[sizeof(uint64_t) * 2];
+
+		memset(data, 0, sizeof(data));
+		char *filename = (char *)data;
+		filename[0] = 'x';
+		filename[1] = '\0';
+
+		char *options = (char *)data + 8;
+		options[0] = 'a';
+		options[1] = 'b';
+		options[2] = 'c';
+		options[3] = '\0';
+
+		trailer->compressed_size = 0;
+		trailer->uncompressed_size = 0;
+		trailer->filename_size = 8;
+		trailer->options_size = 8;
+		trailer->magic = TRAILER_MAGIC;
+		trailer->version = TRAILER_VERSION;
+		trailer->n_entries = 0;
+
+		auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_TRUE(f);
+		ASSERT_TRUE(f->getOptions() == "abc");
+
+		trailer->magic++;
+		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_FALSE(f);
+
+		trailer->magic--;
+		trailer->version++;
+		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
+		ASSERT_FALSE(f);
+	}
+}
+
+TESTSUITE(system_mode_registration)
+{
+	TEST(can_parse_entries_it_created)
+	{
+		auto entry = createProcessEntry(5, "simon");
+		ASSERT_TRUE(entry);
+
+		uint16_t op;
+		std::string of;
+		auto rv = parseProcessEntry(entry, op, of);
+		ASSERT_TRUE(rv);
+		ASSERT_TRUE(op == 5);
+		ASSERT_TRUE(of == "simon");
+	}
+
+	TEST(cannot_parse_entries_with_wrong_magic_or_version)
+	{
+		auto entry = createProcessEntry(3, "linda");
+		uint16_t op;
+		std::string of;
+
+		entry->magic++;
+		auto rv = parseProcessEntry(entry, op, of);
+		ASSERT_FALSE(rv);
+
+		entry->magic--;
+		entry->version++;
+		rv = parseProcessEntry(entry, op, of);
+		ASSERT_FALSE(rv);
+
+		entry->version--;
+		rv = parseProcessEntry(entry, op, of);
+		ASSERT_TRUE(rv);
+	}
+
+	TEST(cannot_parse_entries_with_size_smaller_than_filename)
+	{
+		auto entry = createProcessEntry(3, "linda");
+		uint16_t op;
+		std::string of;
+
+		entry->entry_size = sizeof(struct new_process_entry) - 1;
+		auto rv = parseProcessEntry(entry, op, of);
+		ASSERT_FALSE(rv);
+	}
+}
diff --git a/kcov-38/tests/unit-tests/tests-utils.cc b/kcov-38/tests/unit-tests/tests-utils.cc
new file mode 100644
index 000000000000..c3fbb3b1d65c
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-utils.cc
@@ -0,0 +1,69 @@
+#include "test.hh"
+
+#include <utils.hh>
+#include <string>
+
+TESTSUITE(utils)
+{
+	TEST(escapeHtml)
+	{
+		char buf[8192];
+
+		memset(buf, '&', sizeof(buf));
+		buf[sizeof(buf) - 1] = '\0';
+
+		std::string s = escape_html(buf);
+		// Should have been truncated
+		ASSERT_TRUE(s.size() < 4096);
+
+		ASSERT_TRUE(s.find("&amp;") != std::string::npos);
+	}
+
+	TEST(escapeJson)
+	{
+		std::string a = "var kalle=1;";
+		std::string b = "var kalle=\"1\";";
+		std::string c = "var a=\"\\hej\";";
+		std::string d = "var kalle=\tX;";
+		std::string e = "var kalle='X';";
+
+		std::string s;
+
+		s = escape_json(a);
+		ASSERT_TRUE(s == a);
+
+		s = escape_json(b);
+		ASSERT_TRUE(s == "var kalle=\\\"1\\\";");
+
+		s = escape_json(c);
+		ASSERT_TRUE(s == "var a=\\\"\\\\hej\\\";");
+
+		s = escape_json(d);
+		ASSERT_TRUE(s == "var kalle=\\tX;");
+
+		s = escape_json(e);
+		ASSERT_TRUE(s == "var kalle=\\'X\\';");
+	}
+
+	TEST(can_concatenate_directory_and_file_correctly)
+	{
+		std::string empty = "";
+		std::string root = "/";
+		std::string singleNoSlash = "/kalle";
+		std::string singleSlash = "/kalle/";
+		std::string singleDoubleSlashes = "/kalle//";
+		std::string doubleNoSlashes = "/kalle/manne";
+		std::string doubleDoubleSlashes = "/kalle/manne//";
+
+		ASSERT_TRUE(dir_concat(empty, "hej") == "hej");
+		ASSERT_TRUE(dir_concat(root, "hej") == "/hej");
+		ASSERT_TRUE(dir_concat(singleNoSlash, "hej") == "/kalle/hej");
+		ASSERT_TRUE(dir_concat(singleSlash, "hej") == "/kalle/hej");
+		ASSERT_TRUE(dir_concat(singleDoubleSlashes, "hej") == "/kalle/hej");
+		ASSERT_TRUE(dir_concat(doubleNoSlashes, "hej") == "/kalle/manne/hej");
+		ASSERT_TRUE(dir_concat(doubleDoubleSlashes, "hej") == "/kalle/manne/hej");
+
+		// Filename with slash
+		ASSERT_TRUE(dir_concat(singleDoubleSlashes, "/hej") == "/kalle/hej");
+	}
+}
diff --git a/kcov-38/tests/unit-tests/tests-writer.cc b/kcov-38/tests/unit-tests/tests-writer.cc
new file mode 100644
index 000000000000..6dada543f086
--- /dev/null
+++ b/kcov-38/tests/unit-tests/tests-writer.cc
@@ -0,0 +1,198 @@
+#include "test.hh"
+
+#include <file-parser.hh>
+#include <collector.hh>
+#include <configuration.hh>
+#include <reporter.hh>
+#include <output-handler.hh>
+#include <writer.hh>
+#include <utils.hh>
+
+#include <chrono>
+#include <thread>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "../../src/writers/html-writer.hh"
+#include "../../src/writers/cobertura-writer.hh"
+
+#include "mocks/mock-collector.hh"
+#include "mocks/mock-reporter.hh"
+
+using namespace kcov;
+
+
+static int filePatternInDir(const char *name, const char *pattern)
+{
+	DIR *d = opendir(name);
+	ASSERT_TRUE(d);
+
+	struct dirent *de = readdir(d);
+	int out = 0;
+
+	while (de)
+	{
+		if (strstr(de->d_name, pattern))
+			out++;
+		de = readdir(d);
+	}
+
+	return out;
+}
+
+DISABLED_TEST(writer, DEADLINE_REALTIME_MS(20000))
+{
+	IFileParser *elf;
+	bool res;
+	char filename[1024];
+	MockReporter reporter;
+	IReporter::LineExecutionCount def(0, 1, 0);
+	IReporter::LineExecutionCount partial(1, 2, 0);
+	IReporter::LineExecutionCount full(3, 3, 0);
+	IReporter::ExecutionSummary summary(17, 4);
+
+	std::string outDir = (std::string(crpcut::get_start_dir()) + "/kcov-writer");
+	system(fmt("rm -rf %s", outDir.c_str()).c_str());
+
+	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(elf);
+
+	const char *argv[] = {NULL, outDir.c_str(), filename};
+	IConfiguration &conf = IConfiguration::getInstance();
+	res = conf.parse(3, argv);
+	ASSERT_TRUE(res);
+
+	REQUIRE_CALL(reporter, lineIsCode(_,_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((true))
+		;
+	REQUIRE_CALL(reporter, fileIsIncluded(_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((true))
+		;
+	REQUIRE_CALL(reporter, lineIsCode(_,7))
+		.TIMES(AT_LEAST(4)) // Both files
+		.RETURN((false))
+		;
+
+	REQUIRE_CALL(reporter, getLineExecutionCount(_,_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((def))
+		;
+	REQUIRE_CALL(reporter, getLineExecutionCount(_,8))
+		.TIMES(AT_LEAST(3))
+		.RETURN((partial))
+		;
+	REQUIRE_CALL(reporter, getLineExecutionCount(_,11))
+		.TIMES(AT_LEAST(2))
+		.RETURN((full))
+		;
+	REQUIRE_CALL(reporter, getExecutionSummary())
+		.TIMES(AT_LEAST(3))
+		.RETURN((summary))
+		;
+
+	MockCollector collector;
+
+	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
+	IWriter &writer = createHtmlWriter(*elf, reporter,
+			output.getBaseDirectory(), output.getOutDirectory(), "kalle");
+	IWriter &coberturaWriter = createCoberturaWriter(*elf, reporter,
+			output.getOutDirectory() + "/cobertura.xml");
+
+	output.registerWriter(writer);
+	output.registerWriter(coberturaWriter);
+
+	res = elf->addFile(filename);
+	ASSERT_TRUE(res == true);
+	res = elf->parse();
+	ASSERT_TRUE(res == true);
+	output.start();
+
+	output.produce();
+
+	REQUIRE_CALL(reporter, marshal(_))
+		.TIMES(AT_LEAST(1))
+		.LR_RETURN(reporter.mockMarshal(_1))
+		;
+
+	output.produce();
+
+	ASSERT_TRUE(filePatternInDir((outDir + "/test-binary").c_str(), "test-source.c") >= 1);
+	ASSERT_TRUE(file_exists((outDir + "/test-binary/cobertura.xml").c_str()));
+
+	output.start();
+
+	delete &output; // UGLY!
+}
+
+
+DISABLED_TEST(writerSameName, DEADLINE_REALTIME_MS(20000))
+{
+	IFileParser *elf;
+	bool res;
+	char filename[1024];
+	MockReporter reporter;
+	IReporter::LineExecutionCount def(0, 1, 0);
+	IReporter::LineExecutionCount partial(1, 2, 1);
+	IReporter::LineExecutionCount full(3, 3, 2);
+	IReporter::ExecutionSummary summary(17, 4);
+
+	std::string outDir = (std::string(crpcut::get_start_dir()) + "/kcov-writerSameName");
+	system(fmt("rm -rf %s", outDir.c_str()).c_str());
+
+	sprintf(filename, "%s/same-name-test", crpcut::get_start_dir());
+	elf = IParserManager::getInstance().matchParser(filename);
+	ASSERT_TRUE(elf);
+
+	const char *argv[] = {NULL, outDir.c_str(), filename};
+	IConfiguration &conf = IConfiguration::getInstance();
+	res = conf.parse(3, argv);
+	ASSERT_TRUE(res);
+
+	REQUIRE_CALL(reporter, lineIsCode(_,_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((true))
+		;
+	REQUIRE_CALL(reporter, fileIsIncluded(_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((true))
+		;
+
+	REQUIRE_CALL(reporter, getLineExecutionCount(_,_))
+		.TIMES(AT_LEAST(1))
+		.RETURN((def))
+		;
+	REQUIRE_CALL(reporter, getExecutionSummary())
+		.TIMES(AT_LEAST(2))
+		.RETURN((summary))
+		;
+
+	MockCollector collector;
+	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
+	IWriter &writer = createHtmlWriter(*elf, reporter,
+			output.getBaseDirectory(), output.getOutDirectory(), "anka");
+
+	output.registerWriter(writer);
+
+	res = elf->addFile(filename);
+	ASSERT_TRUE(res == true);
+	res = elf->parse();
+	ASSERT_TRUE(res == true);
+	output.start();
+
+	output.produce();
+
+	REQUIRE_CALL(reporter, marshal(_))
+		.TIMES(AT_LEAST(1))
+		.LR_RETURN(reporter.mockMarshal(_1))
+		;
+
+	output.produce();
+
+	int cnt = filePatternInDir((outDir + "/same-name-test").c_str(), "html");
+	ASSERT_TRUE(cnt == 4); // index.html + 3 source files
+
+	delete &output; // UGLY!
+}
diff --git a/kcov-38/tools/CMakeLists.txt b/kcov-38/tools/CMakeLists.txt
new file mode 100644
index 000000000000..2ce9ae8a9173
--- /dev/null
+++ b/kcov-38/tools/CMakeLists.txt
@@ -0,0 +1,83 @@
+cmake_minimum_required (VERSION 2.8.4)
+project (kcov-tools)
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
+if (POLICY CMP0042)
+    # MACOSX_RPATH is enabled by default.
+    cmake_policy (SET CMP0042 NEW)
+endif (POLICY CMP0042)
+
+option (SPECIFY_RPATH  "Specify RPATH for installed executables" OFF)
+mark_as_advanced (SPECIFY_RPATH)
+
+find_package (LibElf REQUIRED)
+find_package (Elfutils REQUIRED)
+find_package (PkgConfig REQUIRED)
+find_package (Threads)
+find_package (ZLIB REQUIRED)
+
+find_library (DL_LIBRARY NAMES dl)
+if (DL_LIBRARY)
+    message (STATUS "Found DL: ${DL_LIBRARY}")
+else (DL_LIBRARY)
+    message (FATAL_ERROR "Could NOT find DL")
+endif (DL_LIBRARY)
+
+find_library (M_LIBRARY NAMES m)
+if (M_LIBRARY)
+    message (STATUS "Found M: ${M_LIBRARY}")
+else (M_LIBRARY)
+    message (FATAL_ERROR "Could NOT find M")
+endif (M_LIBRARY)
+
+# ====================================
+# project name and version
+# ====================================
+set (LINE2ADDR line2addr)
+
+set (${LINE2ADDR}_SRCS
+    ../src/capabilities.cc
+    ../src/configuration.cc
+    ../src/filter.cc
+    ../src/gcov.cc
+    ../src/parsers/dwarf.cc
+    ../src/parsers/elf-parser.cc
+    ../src/parsers/elf.cc
+    ../src/parsers/dummy-disassembler.cc
+    ../src/parser-manager.cc
+    ../src/utils.cc
+    line2addr.cc
+)
+
+
+set (CMAKE_CXX_FLAGS "-std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX}")
+
+include_directories(
+    ../src/include/
+    ${LIBELF_INCLUDE_DIRS}
+    ${LIBDW_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+)
+
+# Reference: http://www.cmake.org/Wiki/CMake_RPATH_handling
+if (SPECIFY_RPATH)
+    set (CMAKE_SKIP_BUILD_RPATH OFF)
+    set (CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
+    set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
+    # the RPATH to be used when installing, but only if it's not a system directory
+    list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" IS_SYSTEM_DIR)
+    if (IS_SYSTEM_DIR EQUAL -1)
+        set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+    endif (IS_SYSTEM_DIR EQUAL -1)
+endif (SPECIFY_RPATH)
+
+add_executable (${LINE2ADDR} ${${LINE2ADDR}_SRCS})
+
+target_link_libraries(${LINE2ADDR}
+    "${DL_LIBRARY}"
+    ${LIBDW_LIBRARIES}
+    ${LIBELF_LIBRARIES}
+    "${M_LIBRARY}"
+    stdc++
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${ZLIB_LIBRARIES})
diff --git a/kcov-38/tools/line2addr.cc b/kcov-38/tools/line2addr.cc
new file mode 100644
index 000000000000..bb2f677dbd2a
--- /dev/null
+++ b/kcov-38/tools/line2addr.cc
@@ -0,0 +1,73 @@
+#include <configuration.hh>
+#include <file-parser.hh>
+#include <utils.hh>
+
+using namespace kcov;
+
+const char *kcov_version = "";
+
+class Listener : public IFileParser::ILineListener
+{
+public:
+	Listener(IFileParser &parser, const std::string &filePattern, int lineNr) :
+		m_filePattern(filePattern),
+		m_lineNr(lineNr)
+	{
+		parser.registerLineListener(*this);
+	}
+
+	virtual ~Listener()
+	{
+	}
+
+	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
+	{
+		if (file.find(m_filePattern) != std::string::npos) {
+			if (m_lineNr < 0 || lineNr == (unsigned int)m_lineNr)
+				report(addr);
+		}
+	}
+
+private:
+	void report(unsigned long addr)
+	{
+		printf("0x%lx\n", addr);
+	}
+
+	const std::string m_filePattern;
+	int m_lineNr;
+};
+
+int main(int argc, const char *argv[])
+{
+	if (argc < 3) {
+		fprintf(stderr, "Usage: line2addr in-file file-pattern [line-nr]\n");
+		return 1;
+	}
+
+	std::string file(argv[1]);
+	std::string fileName(argv[2]);
+	int lineNr = -1;
+
+	if (argc >= 4) {
+		if (!string_is_integer(argv[3])) {
+			fprintf(stderr, "line-nr argument (%s) must be integer\n", argv[3]);
+			exit(1);
+		}
+
+		lineNr = string_to_integer(argv[3]);
+	}
+
+
+	IFileParser *parser = IParserManager::getInstance().matchParser(file);
+	if (!parser) {
+		fprintf(stderr, "Can't match parser for %s\n", file.c_str());
+		return 1;
+	}
+
+	Listener listener(*parser, fileName, lineNr);
+
+	parser->addFile(file);
+
+	return parser->parse() ? 0 : 1;
+}
diff --git a/kcov-38/travis/Makefile b/kcov-38/travis/Makefile
new file mode 100644
index 000000000000..c8143bb0b08c
--- /dev/null
+++ b/kcov-38/travis/Makefile
@@ -0,0 +1,159 @@
+#!/usr/bin/make
+
+chroot=/tmp/32-bit-chroot
+kcov_deps=libdw-dev libelf-dev elfutils libcurl4-openssl-dev python python3 cmake binutils-dev git
+
+.PHONY: prepare_environment
+
+build_reference:
+	mkdir -p reference/src reference/build
+	cd reference/ && git clone https://github.com/SimonKagstrom/kcov.git
+	cd reference/kcov && git checkout v23
+	cd reference/build && cmake ../kcov
+	make -C reference/build/
+	cp reference/build/src/kcov /tmp/kcov-reference
+
+build-osx-xcode:
+	mkdir -p build-xcode
+	cd build-xcode && cmake -G Xcode ..
+	cd build-xcode && xcodebuild
+
+build-osx: build-osx-xcode
+	mkdir -p build build-tests
+	cd build && cmake ..
+	make -C build
+	cd build-tests && cmake ../tests
+	make -C build-tests
+
+build:
+	mkdir -p build build-tests build-tools
+	cd build && CXXFLAGS=-Werror cmake ..
+	make -C build
+	cd build-tools && cmake ../tools
+	make -C build-tools
+	sudo make -C build install
+	cd build-tests && cmake ../tests
+	make -C build-tests
+
+build_gcc: build run_unit_tests build_reference patchelf-i386-chroot
+	sudo rm -rf ${chroot}/tmp/kcov/build ${chroot}/tmp/kcov/build-tests
+	sudo mkdir -p ${chroot}/tmp/kcov/build ${chroot}/tmp/kcov/build-tests ${chroot}/tmp/kcov/build-tools
+	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build && cmake .."
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build"
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build install"
+	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build-tools && cmake ../tools"
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-tools"
+	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build-tests && cmake ../tests"
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-tests"
+	sudo i386 chroot ${chroot} sh -c "apt-get -y remove binutils-dev"
+	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/kcov/build-no-binutils && cd /tmp/kcov/build-no-binutils && cmake .."
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-no-binutils"
+	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/kcov/build-static && cd /tmp/kcov/build-static && cmake -DKCOV_STATIC_BUILD=ON .."
+	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-static"
+
+build_clang_linux:
+	mkdir -p build build-tests build-tools
+	cd build && CC=clang-3.9 CXX=clang++-3.9 CXXFLAGS=-Werror cmake ..
+	make -C build
+	cd build-tools && cmake ../tools
+	make -C build-tools
+	sudo make -C build install
+	cd build-tests && CC=clang-3.9 CXX=clang++-3.9 cmake ../tests
+	CC=clang-3.9 CXX=clang++-3.9 make -C build-tests
+
+build_clang:
+	mkdir -p build build-tests build-tools
+	cd build && CC=clang-3.9 CXX=clang++-3.9 CXXFLAGS=-Werror cmake ..
+	make -C build
+	cd build-tools && cmake ../tools
+	make -C build-tools
+	sudo make -C build install
+	cd build-tests && CC=clang-3.9 CXX=clang++-3.9 cmake ../tests
+	CC=clang-3.9 CXX=clang++-3.9 make -C build-tests
+
+run-performance: build_gcc
+	travis/perf-test.sh build/src/kcov . build >/dev/null
+	/usr/bin/time -f "%e" travis/perf-test.sh build/src/kcov . build >/dev/null
+	rm -rf /tmp/kcov-perf
+	travis/perf-test.sh /tmp/kcov-reference . build >/dev/null
+	/usr/bin/time -f "%e" travis/perf-test.sh /tmp/kcov-reference . build >/dev/null
+
+run-tests-linux-gcc: run-performance
+	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
+	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/output"
+	sudo i386 chroot ${chroot} sh -c "PATH=/bin:/usr/bin:/sbin:/usr/sbin /tmp/kcov/tests/tools/run-tests /tmp/kcov/build/src/kcov /tmp/output /tmp/kcov/build-tests/ /tmp/kcov -v"
+	build/src/kcov --coveralls-id=$(TRAVIS_JOB_ID) --include-pattern=kcov --exclude-pattern=helper.cc,library.cc,html-data-files.cc /tmp/kcov-kcov build/src/kcov || true
+	wget https://codecov.io/bash || true
+	bash bash -s /tmp/kcov-kcov || true
+
+run-tests-linux-clang: build_clang_linux
+	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
+
+trompeloeil:
+	git submodule update --recursive --remote
+
+patchelf:
+	wget https://github.com/NixOS/patchelf/archive/0.9.tar.gz
+	tar -xf 0.9.tar.gz
+	cd patchelf-0.9 && ./bootstrap.sh && ./configure && make && sudo make install
+
+patchelf-i386-chroot: patchelf
+	wget https://github.com/NixOS/patchelf/archive/0.9.tar.gz
+	sudo cp 0.9.tar.gz ${chroot}
+	sudo i386 chroot ${chroot} sh -c "tar -xf 0.9.tar.gz"
+	sudo i386 chroot ${chroot} sh -c "cd patchelf-0.9 && ./bootstrap.sh && ./configure && make && make install"
+
+build_unit_tests: trompeloeil
+	mkdir -p build-ut
+	cd build-ut && CXX=g++-6 CC=gcc-6 cmake ../tests/unit-tests/
+	CXX=g++-6 CC=gcc-6 make -C build-ut
+
+run_unit_tests: build build_unit_tests
+	cd build-ut && ./ut
+
+run-tests-osx-gcc: build-osx
+	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
+
+run-tests-osx-clang: build-osx
+	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
+
+
+run-tests: run-tests-${TRAVIS_OS_NAME}-${CC}
+
+
+prepare_osx_clang:
+
+prepare_osx_gcc:
+
+prepare_osx:
+	brew update
+	brew install zlib
+	brew upgrade python
+	brew install bash
+
+prepare_linux: patchelf
+	sudo sh -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
+	sudo add-apt-repository ppa:jonlar/crpcut -y
+	sudo apt-get update -q
+	sudo apt-get install -y --allow-unauthenticated ${kcov_deps} gcc-multilib debootstrap git time curl crpcut crpcut-dev
+
+prepare_linux_gcc:
+	sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+	sudo apt-get update -q
+	sudo apt-get install g++-6
+
+	sudo i386 debootstrap --arch=i386 --components=main,universe  precise $(chroot)
+	sudo i386 chroot "${chroot}" apt-get update
+	sudo i386 chroot "${chroot}" apt-get install -y build-essential autoconf
+	sudo i386 chroot "${chroot}" apt-get install -y --allow-unauthenticated ${kcov_deps}
+	sudo cp -r "$(shell pwd)" "${chroot}/tmp/"
+	sudo i386 chroot "${chroot}" sh -c "mount -t proc procfs /proc"
+	sudo i386 chroot "${chroot}" sh -c "mount -t tmpfs none /dev/shm"
+
+
+prepare_linux_clang:
+	sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'
+	sudo apt-get update --force-yes -qq
+	sudo apt-get install -qq --force-yes -y clang-3.9 libboost-all-dev binutils-dev
+
+prepare_environment: prepare_${TRAVIS_OS_NAME} prepare_${TRAVIS_OS_NAME}_${CC}
diff --git a/kcov-38/travis/perf-test.sh b/kcov-38/travis/perf-test.sh
new file mode 100755
index 000000000000..05f0a16d9f07
--- /dev/null
+++ b/kcov-38/travis/perf-test.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ $# -ne 3 ] ; then
+	echo "Usage: perf-test.sh <kcov> <src-dir> <build-dir>"
+	exit 1
+fi
+
+KCOV=$1
+SRC=$2
+BUILD=$3
+
+$KCOV /tmp/kcov-perf $BUILD/src/kcov
+$KCOV /tmp/kcov-perf $SRC/tests/python/main 5
+$KCOV /tmp/kcov-perf $SRC/tests/bash/shell-main 5
+$KCOV /tmp/kcov-perf $BUILD/src/kcov /tmp/kcov-perf $SRC/tests/python/main 5
+$KCOV /tmp/kcov-perf $BUILD/src/kcov /tmp/kcov-perf $SRC/tests/bash/shell-main 5
+
+exit 0

From f35ac4eac33ca9b85683f2747585094383c59379 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 19:52:26 -0500
Subject: [PATCH 041/118] wip

---
 kcov-38/.dockerignore                         |    2 -
 kcov-38/.gitignore                            |   13 -
 kcov-38/.gitmodules                           |    3 -
 kcov-38/.travis.yml                           |   47 -
 kcov-38/CMakeLists.txt                        |   50 -
 kcov-38/CONTRIBUTING.md                       |   12 -
 kcov-38/COPYING                               |  339 --
 kcov-38/COPYING.externals                     |    3 -
 kcov-38/CPack.local.cmake                     |   29 -
 kcov-38/ChangeLog                             |  740 ----
 kcov-38/Dockerfile                            |   40 -
 kcov-38/INSTALL.md                            |   94 -
 kcov-38/README                                |    1 -
 kcov-38/README.md                             |   96 -
 kcov-38/cmake/FindBfd.cmake                   |   85 -
 kcov-38/cmake/FindElfutils.cmake              |   77 -
 kcov-38/cmake/FindLibCRPCUT.cmake             |   59 -
 kcov-38/cmake/FindLibElf.cmake                |   68 -
 kcov-38/cmake/TargetArch.cmake                |  134 -
 kcov-38/data/amber.png                        |  Bin 141 -> 0 bytes
 kcov-38/data/bcov.css                         |   32 -
 kcov-38/data/glass.png                        |  Bin 167 -> 0 bytes
 kcov-38/data/index.html                       |   97 -
 kcov-38/data/js/handlebars.js                 | 3079 -----------------
 kcov-38/data/js/jquery.min.js                 |    4 -
 kcov-38/data/js/jquery.tablesorter.min.js     |    5 -
 .../data/js/jquery.tablesorter.widgets.min.js |   17 -
 kcov-38/data/js/kcov.js                       |   78 -
 kcov-38/data/source-file.html                 |   71 -
 kcov-38/data/tablesorter-theme.css            |  221 --
 kcov-38/debian/.gitignore                     |    3 -
 kcov-38/debian/README                         |    6 -
 kcov-38/debian/changelog                      |    5 -
 kcov-38/debian/compat                         |    1 -
 kcov-38/debian/control                        |   19 -
 kcov-38/debian/copyright                      |   34 -
 kcov-38/debian/kcov-docs.docs                 |    3 -
 kcov-38/debian/rules                          |   25 -
 kcov-38/debian/source/format                  |    1 -
 kcov-38/doc/CMakeLists.txt                    |    1 -
 kcov-38/doc/codecov.md                        |   17 -
 kcov-38/doc/coveralls.md                      |   11 -
 kcov-38/doc/design.txt                        |   78 -
 kcov-38/doc/full-system-instrumentation.md    |   35 -
 kcov-38/doc/gitlab.md                         |    8 -
 kcov-38/doc/jenkins.md                        |    6 -
 kcov-38/doc/kcov.1                            |  175 -
 kcov-38/doc/sonarqube.md                      |    5 -
 kcov-38/external/lldb/include/lldb/API/LLDB.h |   57 -
 .../lldb/include/lldb/API/SBAddress.h         |  152 -
 .../lldb/include/lldb/API/SBAttachInfo.h      |  149 -
 .../external/lldb/include/lldb/API/SBBlock.h  |  123 -
 .../lldb/include/lldb/API/SBBreakpoint.h      |  193 --
 .../include/lldb/API/SBBreakpointLocation.h   |  114 -
 .../lldb/include/lldb/API/SBBroadcaster.h     |   97 -
 .../include/lldb/API/SBCommandInterpreter.h   |  318 --
 .../include/lldb/API/SBCommandReturnObject.h  |  133 -
 .../lldb/include/lldb/API/SBCommunication.h   |  100 -
 .../lldb/include/lldb/API/SBCompileUnit.h     |  119 -
 .../external/lldb/include/lldb/API/SBData.h   |  181 -
 .../lldb/include/lldb/API/SBDebugger.h        |  363 --
 .../lldb/include/lldb/API/SBDeclaration.h     |   89 -
 .../lldb/include/lldb/API/SBDefines.h         |  101 -
 .../external/lldb/include/lldb/API/SBError.h  |  108 -
 .../external/lldb/include/lldb/API/SBEvent.h  |  105 -
 .../include/lldb/API/SBExecutionContext.h     |   74 -
 .../include/lldb/API/SBExpressionOptions.h    |  135 -
 .../lldb/include/lldb/API/SBFileSpec.h        |  104 -
 .../lldb/include/lldb/API/SBFileSpecList.h    |   72 -
 .../external/lldb/include/lldb/API/SBFrame.h  |  237 --
 .../lldb/include/lldb/API/SBFunction.h        |   96 -
 .../external/lldb/include/lldb/API/SBHostOS.h |   60 -
 .../lldb/include/lldb/API/SBInstruction.h     |   94 -
 .../lldb/include/lldb/API/SBInstructionList.h |   71 -
 .../lldb/include/lldb/API/SBLanguageRuntime.h |   29 -
 .../lldb/include/lldb/API/SBLaunchInfo.h      |  195 --
 .../lldb/include/lldb/API/SBLineEntry.h       |   99 -
 .../lldb/include/lldb/API/SBListener.h        |  145 -
 .../external/lldb/include/lldb/API/SBModule.h |  359 --
 .../lldb/include/lldb/API/SBModuleSpec.h      |  154 -
 .../lldb/include/lldb/API/SBPlatform.h        |  211 --
 .../lldb/include/lldb/API/SBProcess.h         |  369 --
 .../external/lldb/include/lldb/API/SBQueue.h  |   89 -
 .../lldb/include/lldb/API/SBQueueItem.h       |   57 -
 .../lldb/include/lldb/API/SBSection.h         |  116 -
 .../lldb/include/lldb/API/SBSourceManager.h   |   53 -
 .../external/lldb/include/lldb/API/SBStream.h |  114 -
 .../lldb/include/lldb/API/SBStringList.h      |   71 -
 .../external/lldb/include/lldb/API/SBSymbol.h |  109 -
 .../lldb/include/lldb/API/SBSymbolContext.h   |   94 -
 .../include/lldb/API/SBSymbolContextList.h    |   69 -
 .../external/lldb/include/lldb/API/SBTarget.h |  819 -----
 .../external/lldb/include/lldb/API/SBThread.h |  259 --
 .../include/lldb/API/SBThreadCollection.h     |   68 -
 .../lldb/include/lldb/API/SBThreadPlan.h      |  129 -
 .../external/lldb/include/lldb/API/SBType.h   |  333 --
 .../lldb/include/lldb/API/SBTypeCategory.h    |  168 -
 .../lldb/include/lldb/API/SBTypeEnumMember.h  |   98 -
 .../lldb/include/lldb/API/SBTypeFilter.h      |   92 -
 .../lldb/include/lldb/API/SBTypeFormat.h      |  100 -
 .../include/lldb/API/SBTypeNameSpecifier.h    |   77 -
 .../lldb/include/lldb/API/SBTypeSummary.h     |  165 -
 .../lldb/include/lldb/API/SBTypeSynthetic.h   |  102 -
 .../lldb/include/lldb/API/SBUnixSignals.h     |   84 -
 .../external/lldb/include/lldb/API/SBValue.h  |  504 ---
 .../lldb/include/lldb/API/SBValueList.h       |   96 -
 .../include/lldb/API/SBVariablesOptions.h     |   98 -
 .../lldb/include/lldb/API/SBWatchpoint.h      |  104 -
 .../include/lldb/API/SystemInitializerFull.h  |   40 -
 .../lldb/include/lldb/Utility/SharingPtr.h    |  841 -----
 .../external/lldb/include/lldb/lldb-defines.h |  153 -
 .../lldb/include/lldb/lldb-enumerations.h     | 1052 ------
 .../external/lldb/include/lldb/lldb-forward.h |  440 ---
 .../external/lldb/include/lldb/lldb-types.h   |  118 -
 .../lldb/include/lldb/lldb-versioning.h       | 1607 ---------
 kcov-38/src/CMakeLists.txt                    |  460 ---
 kcov-38/src/bin-to-c-source.py                |   36 -
 kcov-38/src/capabilities.cc                   |   49 -
 kcov-38/src/cmake_uninstall.cmake.in          |   21 -
 kcov-38/src/collector.cc                      |  198 --
 kcov-38/src/configuration.cc                  |  809 -----
 kcov-38/src/dummy-solib-handler.cc            |   20 -
 kcov-38/src/engine-factory.cc                 |   63 -
 kcov-38/src/engines/bash-engine.cc            |  845 -----
 kcov-38/src/engines/bash-execve-redirector.c  |   87 -
 kcov-38/src/engines/bash-helper-debug-trap.sh |    5 -
 kcov-38/src/engines/bash-helper.sh            |    4 -
 kcov-38/src/engines/clang-coverage-engine.cc  |  268 --
 kcov-38/src/engines/gcov-engine.cc            |  205 --
 kcov-38/src/engines/kernel-engine.cc          |  189 -
 kcov-38/src/engines/lldb-engine.cc            |  486 ---
 kcov-38/src/engines/ptrace.cc                 |  471 ---
 kcov-38/src/engines/ptrace_freebsd.cc         |  184 -
 kcov-38/src/engines/ptrace_linux.cc           |  430 ---
 kcov-38/src/engines/ptrace_sys.hh             |   26 -
 kcov-38/src/engines/python-engine.cc          |  474 ---
 kcov-38/src/engines/python-helper.py          |  109 -
 kcov-38/src/engines/script-engine-base.hh     |  117 -
 kcov-38/src/engines/system-mode-binary-lib.cc |   86 -
 kcov-38/src/engines/system-mode-engine.cc     |  267 --
 .../src/engines/system-mode-file-format.cc    |  125 -
 .../src/engines/system-mode-file-format.hh    |   86 -
 kcov-38/src/filter.cc                         |  362 --
 kcov-38/src/gcov.cc                           |  409 ---
 kcov-38/src/include/capabilities.hh           |   52 -
 kcov-38/src/include/collector.hh              |   60 -
 kcov-38/src/include/configuration.hh          |  128 -
 kcov-38/src/include/disassembler.hh           |   48 -
 kcov-38/src/include/elf.hh                    |  129 -
 kcov-38/src/include/engine.hh                 |  124 -
 kcov-38/src/include/file-parser.hh            |  184 -
 kcov-38/src/include/filter.hh                 |   58 -
 kcov-38/src/include/gcov.hh                   |  182 -
 kcov-38/src/include/generated-data-base.hh    |   29 -
 kcov-38/src/include/lineid.hh                 |   14 -
 kcov-38/src/include/manager.hh                |   10 -
 kcov-38/src/include/output-handler.hh         |   34 -
 kcov-38/src/include/phdr_data.h               |   50 -
 kcov-38/src/include/reporter.hh               |  130 -
 kcov-38/src/include/solib-handler.hh          |   22 -
 kcov-38/src/include/source-file-cache.hh      |   38 -
 kcov-38/src/include/swap-endian.hh            |   67 -
 kcov-38/src/include/system-mode/file-data.hh  |   66 -
 .../src/include/system-mode/registration.hh   |   23 -
 kcov-38/src/include/utils.hh                  |  212 --
 kcov-38/src/include/writer.hh                 |   33 -
 kcov-38/src/kernel/Makefile                   |   12 -
 kcov-38/src/kernel/kprobe-coverage.c          |  589 ----
 kcov-38/src/main-system-daemon.cc             |  472 ---
 kcov-38/src/main.cc                           |  579 ----
 kcov-38/src/merge-file-parser.cc              |  616 ----
 kcov-38/src/merge-parser.hh                   |   23 -
 kcov-38/src/output-handler.cc                 |  150 -
 kcov-38/src/parser-manager.cc                 |   63 -
 kcov-38/src/parsers/bfd-disassembler.cc       |  439 ---
 kcov-38/src/parsers/dummy-disassembler.cc     |   49 -
 kcov-38/src/parsers/dwarf-libdwarf.cc         |  152 -
 kcov-38/src/parsers/dwarf.cc                  |  229 --
 kcov-38/src/parsers/dwarf.hh                  |   32 -
 kcov-38/src/parsers/elf-parser.cc             |  585 ----
 kcov-38/src/parsers/elf.cc                    |  275 --
 kcov-38/src/parsers/libdwarf-dwarf.cpp        |    9 -
 kcov-38/src/reporter.cc                       |  788 -----
 kcov-38/src/solib-handler.cc                  |  281 --
 kcov-38/src/solib-parser/lib.c                |  125 -
 kcov-38/src/solib-parser/phdr_data.c          |  108 -
 kcov-38/src/source-file-cache.cc              |  112 -
 kcov-38/src/system-mode/file-data.cc          |  280 --
 kcov-38/src/system-mode/registration.cc       |   66 -
 kcov-38/src/utils.cc                          |  722 ----
 kcov-38/src/writers/cobertura-writer.cc       |  206 --
 kcov-38/src/writers/cobertura-writer.hh       |   13 -
 kcov-38/src/writers/coveralls-writer.cc       |  248 --
 kcov-38/src/writers/coveralls-writer.hh       |    9 -
 kcov-38/src/writers/dummy-coveralls-writer.cc |   29 -
 kcov-38/src/writers/html-writer.cc            |  413 ---
 kcov-38/src/writers/html-writer.hh            |   14 -
 kcov-38/src/writers/json-writer.cc            |  131 -
 kcov-38/src/writers/json-writer.hh            |   11 -
 kcov-38/src/writers/sonarqube-xml-writer.cc   |  106 -
 kcov-38/src/writers/sonarqube-xml-writer.hh   |   11 -
 kcov-38/src/writers/writer-base.cc            |  167 -
 kcov-38/src/writers/writer-base.hh            |   64 -
 kcov-38/tests/CMakeLists.txt                  |  193 --
 kcov-38/tests/argv-dependent.c                |   23 -
 kcov-38/tests/assembly/illegal-insn.S         |    4 -
 kcov-38/tests/bash/dollar-one-question.sh     |    4 -
 kcov-38/tests/bash/dollar-var-replacements.sh |    5 -
 kcov-38/tests/bash/first-dir/a.sh             |   10 -
 kcov-38/tests/bash/first-dir/b.sh             |    3 -
 kcov-38/tests/bash/first-dir/c.sh             |    4 -
 kcov-38/tests/bash/function-with-spaces.sh    |   19 -
 kcov-38/tests/bash/handle-all-output.sh       |    5 -
 kcov-38/tests/bash/multiline-alias.sh         |    6 -
 kcov-38/tests/bash/multiline-backslash.sh     |    5 -
 kcov-38/tests/bash/no-executed-statements.sh  |    6 -
 kcov-38/tests/bash/other.sh                   |   55 -
 kcov-38/tests/bash/redirect-stderr.sh         |    3 -
 kcov-38/tests/bash/second-dir/a.sh            |   10 -
 kcov-38/tests/bash/second-dir/b.sh            |    3 -
 kcov-38/tests/bash/second-dir/c.sh            |    4 -
 kcov-38/tests/bash/sh-shebang.sh              |    4 -
 kcov-38/tests/bash/shell-main                 |  180 -
 kcov-38/tests/bash/short-test.sh              |    6 -
 kcov-38/tests/bash/subshell.sh                |    8 -
 kcov-38/tests/bash/trap.sh                    |   14 -
 kcov-38/tests/bash/unitundertest.sh           |   40 -
 kcov-38/tests/daemon/test-daemon.cc           |   44 -
 kcov-38/tests/daemon/test-issue31.cc          |   32 -
 kcov-38/tests/daemon/test-script.sh           |   20 -
 kcov-38/tests/dlopen/dlopen-main.cc           |   13 -
 kcov-38/tests/dlopen/dlopen.cc                |   28 -
 kcov-38/tests/fork/fork+exec.c                |   32 -
 kcov-38/tests/fork/fork-no-wait.c             |   30 -
 kcov-38/tests/fork/fork.c                     |   47 -
 kcov-38/tests/fork/vfork.c                    |   27 -
 .../global-constructors/test-global-ctors.cc  |   14 -
 kcov-38/tests/include/header.h                |   17 -
 kcov-38/tests/main.cc                         |   26 -
 kcov-38/tests/merge-tests/file.c              |    9 -
 kcov-38/tests/merge-tests/main_1.c            |   13 -
 kcov-38/tests/merge-tests/main_2.c            |   13 -
 kcov-38/tests/multi-fork/code-template.c      |   29 -
 .../tests/multi-fork/generate-functions.py    |   29 -
 kcov-38/tests/multi-fork/test-multi-fork.c    |   46 -
 kcov-38/tests/pie.c                           |    7 -
 kcov-38/tests/popen/test-popen.c              |   63 -
 kcov-38/tests/python/main                     |   30 -
 kcov-38/tests/python/second.py                |   78 -
 kcov-38/tests/python/short-test.py            |   10 -
 kcov-38/tests/python/unittest/testdriver      |   28 -
 .../tests/python/unittest/unitundertest.py    |   11 -
 kcov-38/tests/recursive-ptrace/main.cc        |   68 -
 kcov-38/tests/sanitizer-coverage.c            |   26 -
 .../tests/setpgid-kill/setpgid-kill-main.cc   |   28 -
 kcov-38/tests/setpgid-kill/test-script.sh     |   16 -
 kcov-38/tests/shared-library/big-symbol.S     |    9 -
 kcov-38/tests/shared-library/main.c           |   12 -
 .../shared-library/recursive-ld-preload.c     |    7 -
 kcov-38/tests/shared-library/solib.c          |   18 -
 kcov-38/tests/short-file.c                    |    1 -
 kcov-38/tests/signals/test-signals.c          |  297 --
 kcov-38/tests/subdir/file.c                   |    8 -
 kcov-38/tests/subdir2/file.c                  |    8 -
 kcov-38/tests/subdir2/file2.c                 |    8 -
 kcov-38/tests/test-module/Makefile            |   12 -
 kcov-38/tests/test-module/test_module.c       |   64 -
 kcov-38/tests/threads/thread-main.c           |   40 -
 kcov-38/tests/tools/accumulate.py             |   80 -
 kcov-38/tests/tools/bash.py                   |  326 --
 kcov-38/tests/tools/bash_linux_only.py        |   12 -
 kcov-38/tests/tools/basic.py                  |   28 -
 kcov-38/tests/tools/compiled.py               |  474 ---
 kcov-38/tests/tools/dummy-python.sh           |    3 -
 kcov-38/tests/tools/filter.py                 |   44 -
 kcov-38/tests/tools/parse_cobertura.py        |   82 -
 kcov-38/tests/tools/python.py                 |  111 -
 kcov-38/tests/tools/run-tests                 |   27 -
 kcov-38/tests/tools/system_mode.py            |   68 -
 kcov-38/tests/tools/testbase.py               |   65 -
 kcov-38/tests/unit-tests/CMakeLists.txt       |  126 -
 kcov-38/tests/unit-tests/main.cc              |   11 -
 .../tests/unit-tests/mocks/mock-collector.hh  |   23 -
 kcov-38/tests/unit-tests/mocks/mock-engine.hh |   26 -
 .../tests/unit-tests/mocks/mock-reporter.hh   |   39 -
 kcov-38/tests/unit-tests/second-source.c      |    8 -
 kcov-38/tests/unit-tests/test-source.c        |   20 -
 kcov-38/tests/unit-tests/test.hh              |    6 -
 kcov-38/tests/unit-tests/tests-collector.cc   |   87 -
 .../tests/unit-tests/tests-configuration.cc   |  150 -
 kcov-38/tests/unit-tests/tests-elf.cc         |   68 -
 kcov-38/tests/unit-tests/tests-filter.cc      |   85 -
 .../tests/unit-tests/tests-merge-parser.cc    |  312 --
 kcov-38/tests/unit-tests/tests-reporter.cc    |  151 -
 kcov-38/tests/unit-tests/tests-system-mode.cc |  449 ---
 kcov-38/tests/unit-tests/tests-utils.cc       |   69 -
 kcov-38/tests/unit-tests/tests-writer.cc      |  198 --
 kcov-38/tools/CMakeLists.txt                  |   83 -
 kcov-38/tools/line2addr.cc                    |   73 -
 kcov-38/travis/Makefile                       |  159 -
 kcov-38/travis/perf-test.sh                   |   18 -
 301 files changed, 41429 deletions(-)
 delete mode 100644 kcov-38/.dockerignore
 delete mode 100644 kcov-38/.gitignore
 delete mode 100644 kcov-38/.gitmodules
 delete mode 100644 kcov-38/.travis.yml
 delete mode 100644 kcov-38/CMakeLists.txt
 delete mode 100644 kcov-38/CONTRIBUTING.md
 delete mode 100644 kcov-38/COPYING
 delete mode 100644 kcov-38/COPYING.externals
 delete mode 100644 kcov-38/CPack.local.cmake
 delete mode 100644 kcov-38/ChangeLog
 delete mode 100644 kcov-38/Dockerfile
 delete mode 100644 kcov-38/INSTALL.md
 delete mode 120000 kcov-38/README
 delete mode 100644 kcov-38/README.md
 delete mode 100644 kcov-38/cmake/FindBfd.cmake
 delete mode 100644 kcov-38/cmake/FindElfutils.cmake
 delete mode 100644 kcov-38/cmake/FindLibCRPCUT.cmake
 delete mode 100644 kcov-38/cmake/FindLibElf.cmake
 delete mode 100644 kcov-38/cmake/TargetArch.cmake
 delete mode 100644 kcov-38/data/amber.png
 delete mode 100644 kcov-38/data/bcov.css
 delete mode 100644 kcov-38/data/glass.png
 delete mode 100644 kcov-38/data/index.html
 delete mode 100644 kcov-38/data/js/handlebars.js
 delete mode 100644 kcov-38/data/js/jquery.min.js
 delete mode 100644 kcov-38/data/js/jquery.tablesorter.min.js
 delete mode 100644 kcov-38/data/js/jquery.tablesorter.widgets.min.js
 delete mode 100644 kcov-38/data/js/kcov.js
 delete mode 100644 kcov-38/data/source-file.html
 delete mode 100644 kcov-38/data/tablesorter-theme.css
 delete mode 100644 kcov-38/debian/.gitignore
 delete mode 100644 kcov-38/debian/README
 delete mode 100644 kcov-38/debian/changelog
 delete mode 100644 kcov-38/debian/compat
 delete mode 100644 kcov-38/debian/control
 delete mode 100644 kcov-38/debian/copyright
 delete mode 100644 kcov-38/debian/kcov-docs.docs
 delete mode 100755 kcov-38/debian/rules
 delete mode 100644 kcov-38/debian/source/format
 delete mode 100644 kcov-38/doc/CMakeLists.txt
 delete mode 100644 kcov-38/doc/codecov.md
 delete mode 100644 kcov-38/doc/coveralls.md
 delete mode 100644 kcov-38/doc/design.txt
 delete mode 100644 kcov-38/doc/full-system-instrumentation.md
 delete mode 100644 kcov-38/doc/gitlab.md
 delete mode 100644 kcov-38/doc/jenkins.md
 delete mode 100644 kcov-38/doc/kcov.1
 delete mode 100644 kcov-38/doc/sonarqube.md
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/LLDB.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBAddress.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBBlock.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBCommunication.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBData.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBDebugger.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBDefines.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBError.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBEvent.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBFrame.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBFunction.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBHostOS.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBInstruction.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBListener.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBModule.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBPlatform.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBProcess.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBQueue.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBSection.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBStream.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBStringList.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbol.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTarget.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBThread.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBType.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBValue.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBValueList.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/lldb-defines.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/lldb-enumerations.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/lldb-forward.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/lldb-types.h
 delete mode 100644 kcov-38/external/lldb/include/lldb/lldb-versioning.h
 delete mode 100644 kcov-38/src/CMakeLists.txt
 delete mode 100755 kcov-38/src/bin-to-c-source.py
 delete mode 100644 kcov-38/src/capabilities.cc
 delete mode 100644 kcov-38/src/cmake_uninstall.cmake.in
 delete mode 100644 kcov-38/src/collector.cc
 delete mode 100644 kcov-38/src/configuration.cc
 delete mode 100644 kcov-38/src/dummy-solib-handler.cc
 delete mode 100644 kcov-38/src/engine-factory.cc
 delete mode 100644 kcov-38/src/engines/bash-engine.cc
 delete mode 100644 kcov-38/src/engines/bash-execve-redirector.c
 delete mode 100755 kcov-38/src/engines/bash-helper-debug-trap.sh
 delete mode 100644 kcov-38/src/engines/bash-helper.sh
 delete mode 100644 kcov-38/src/engines/clang-coverage-engine.cc
 delete mode 100644 kcov-38/src/engines/gcov-engine.cc
 delete mode 100644 kcov-38/src/engines/kernel-engine.cc
 delete mode 100644 kcov-38/src/engines/lldb-engine.cc
 delete mode 100644 kcov-38/src/engines/ptrace.cc
 delete mode 100644 kcov-38/src/engines/ptrace_freebsd.cc
 delete mode 100644 kcov-38/src/engines/ptrace_linux.cc
 delete mode 100644 kcov-38/src/engines/ptrace_sys.hh
 delete mode 100644 kcov-38/src/engines/python-engine.cc
 delete mode 100644 kcov-38/src/engines/python-helper.py
 delete mode 100644 kcov-38/src/engines/script-engine-base.hh
 delete mode 100644 kcov-38/src/engines/system-mode-binary-lib.cc
 delete mode 100644 kcov-38/src/engines/system-mode-engine.cc
 delete mode 100644 kcov-38/src/engines/system-mode-file-format.cc
 delete mode 100644 kcov-38/src/engines/system-mode-file-format.hh
 delete mode 100644 kcov-38/src/filter.cc
 delete mode 100644 kcov-38/src/gcov.cc
 delete mode 100644 kcov-38/src/include/capabilities.hh
 delete mode 100644 kcov-38/src/include/collector.hh
 delete mode 100644 kcov-38/src/include/configuration.hh
 delete mode 100644 kcov-38/src/include/disassembler.hh
 delete mode 100644 kcov-38/src/include/elf.hh
 delete mode 100644 kcov-38/src/include/engine.hh
 delete mode 100644 kcov-38/src/include/file-parser.hh
 delete mode 100644 kcov-38/src/include/filter.hh
 delete mode 100644 kcov-38/src/include/gcov.hh
 delete mode 100644 kcov-38/src/include/generated-data-base.hh
 delete mode 100644 kcov-38/src/include/lineid.hh
 delete mode 100644 kcov-38/src/include/manager.hh
 delete mode 100644 kcov-38/src/include/output-handler.hh
 delete mode 100644 kcov-38/src/include/phdr_data.h
 delete mode 100644 kcov-38/src/include/reporter.hh
 delete mode 100644 kcov-38/src/include/solib-handler.hh
 delete mode 100644 kcov-38/src/include/source-file-cache.hh
 delete mode 100644 kcov-38/src/include/swap-endian.hh
 delete mode 100644 kcov-38/src/include/system-mode/file-data.hh
 delete mode 100644 kcov-38/src/include/system-mode/registration.hh
 delete mode 100644 kcov-38/src/include/utils.hh
 delete mode 100644 kcov-38/src/include/writer.hh
 delete mode 100644 kcov-38/src/kernel/Makefile
 delete mode 100644 kcov-38/src/kernel/kprobe-coverage.c
 delete mode 100644 kcov-38/src/main-system-daemon.cc
 delete mode 100644 kcov-38/src/main.cc
 delete mode 100644 kcov-38/src/merge-file-parser.cc
 delete mode 100644 kcov-38/src/merge-parser.hh
 delete mode 100644 kcov-38/src/output-handler.cc
 delete mode 100644 kcov-38/src/parser-manager.cc
 delete mode 100644 kcov-38/src/parsers/bfd-disassembler.cc
 delete mode 100644 kcov-38/src/parsers/dummy-disassembler.cc
 delete mode 100644 kcov-38/src/parsers/dwarf-libdwarf.cc
 delete mode 100644 kcov-38/src/parsers/dwarf.cc
 delete mode 100644 kcov-38/src/parsers/dwarf.hh
 delete mode 100644 kcov-38/src/parsers/elf-parser.cc
 delete mode 100644 kcov-38/src/parsers/elf.cc
 delete mode 100644 kcov-38/src/parsers/libdwarf-dwarf.cpp
 delete mode 100644 kcov-38/src/reporter.cc
 delete mode 100644 kcov-38/src/solib-handler.cc
 delete mode 100644 kcov-38/src/solib-parser/lib.c
 delete mode 100644 kcov-38/src/solib-parser/phdr_data.c
 delete mode 100644 kcov-38/src/source-file-cache.cc
 delete mode 100644 kcov-38/src/system-mode/file-data.cc
 delete mode 100644 kcov-38/src/system-mode/registration.cc
 delete mode 100644 kcov-38/src/utils.cc
 delete mode 100644 kcov-38/src/writers/cobertura-writer.cc
 delete mode 100644 kcov-38/src/writers/cobertura-writer.hh
 delete mode 100644 kcov-38/src/writers/coveralls-writer.cc
 delete mode 100644 kcov-38/src/writers/coveralls-writer.hh
 delete mode 100644 kcov-38/src/writers/dummy-coveralls-writer.cc
 delete mode 100644 kcov-38/src/writers/html-writer.cc
 delete mode 100644 kcov-38/src/writers/html-writer.hh
 delete mode 100644 kcov-38/src/writers/json-writer.cc
 delete mode 100644 kcov-38/src/writers/json-writer.hh
 delete mode 100644 kcov-38/src/writers/sonarqube-xml-writer.cc
 delete mode 100644 kcov-38/src/writers/sonarqube-xml-writer.hh
 delete mode 100644 kcov-38/src/writers/writer-base.cc
 delete mode 100644 kcov-38/src/writers/writer-base.hh
 delete mode 100644 kcov-38/tests/CMakeLists.txt
 delete mode 100644 kcov-38/tests/argv-dependent.c
 delete mode 100644 kcov-38/tests/assembly/illegal-insn.S
 delete mode 100755 kcov-38/tests/bash/dollar-one-question.sh
 delete mode 100755 kcov-38/tests/bash/dollar-var-replacements.sh
 delete mode 100644 kcov-38/tests/bash/first-dir/a.sh
 delete mode 100644 kcov-38/tests/bash/first-dir/b.sh
 delete mode 100644 kcov-38/tests/bash/first-dir/c.sh
 delete mode 100755 kcov-38/tests/bash/function-with-spaces.sh
 delete mode 100755 kcov-38/tests/bash/handle-all-output.sh
 delete mode 100755 kcov-38/tests/bash/multiline-alias.sh
 delete mode 100755 kcov-38/tests/bash/multiline-backslash.sh
 delete mode 100755 kcov-38/tests/bash/no-executed-statements.sh
 delete mode 100644 kcov-38/tests/bash/other.sh
 delete mode 100755 kcov-38/tests/bash/redirect-stderr.sh
 delete mode 100644 kcov-38/tests/bash/second-dir/a.sh
 delete mode 100644 kcov-38/tests/bash/second-dir/b.sh
 delete mode 100644 kcov-38/tests/bash/second-dir/c.sh
 delete mode 100755 kcov-38/tests/bash/sh-shebang.sh
 delete mode 100755 kcov-38/tests/bash/shell-main
 delete mode 100755 kcov-38/tests/bash/short-test.sh
 delete mode 100755 kcov-38/tests/bash/subshell.sh
 delete mode 100755 kcov-38/tests/bash/trap.sh
 delete mode 100755 kcov-38/tests/bash/unitundertest.sh
 delete mode 100644 kcov-38/tests/daemon/test-daemon.cc
 delete mode 100644 kcov-38/tests/daemon/test-issue31.cc
 delete mode 100755 kcov-38/tests/daemon/test-script.sh
 delete mode 100644 kcov-38/tests/dlopen/dlopen-main.cc
 delete mode 100644 kcov-38/tests/dlopen/dlopen.cc
 delete mode 100644 kcov-38/tests/fork/fork+exec.c
 delete mode 100644 kcov-38/tests/fork/fork-no-wait.c
 delete mode 100644 kcov-38/tests/fork/fork.c
 delete mode 100644 kcov-38/tests/fork/vfork.c
 delete mode 100644 kcov-38/tests/global-constructors/test-global-ctors.cc
 delete mode 100644 kcov-38/tests/include/header.h
 delete mode 100644 kcov-38/tests/main.cc
 delete mode 100644 kcov-38/tests/merge-tests/file.c
 delete mode 100644 kcov-38/tests/merge-tests/main_1.c
 delete mode 100644 kcov-38/tests/merge-tests/main_2.c
 delete mode 100644 kcov-38/tests/multi-fork/code-template.c
 delete mode 100755 kcov-38/tests/multi-fork/generate-functions.py
 delete mode 100644 kcov-38/tests/multi-fork/test-multi-fork.c
 delete mode 100644 kcov-38/tests/pie.c
 delete mode 100644 kcov-38/tests/popen/test-popen.c
 delete mode 100755 kcov-38/tests/python/main
 delete mode 100644 kcov-38/tests/python/second.py
 delete mode 100755 kcov-38/tests/python/short-test.py
 delete mode 100755 kcov-38/tests/python/unittest/testdriver
 delete mode 100644 kcov-38/tests/python/unittest/unitundertest.py
 delete mode 100644 kcov-38/tests/recursive-ptrace/main.cc
 delete mode 100644 kcov-38/tests/sanitizer-coverage.c
 delete mode 100644 kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
 delete mode 100755 kcov-38/tests/setpgid-kill/test-script.sh
 delete mode 100644 kcov-38/tests/shared-library/big-symbol.S
 delete mode 100644 kcov-38/tests/shared-library/main.c
 delete mode 100644 kcov-38/tests/shared-library/recursive-ld-preload.c
 delete mode 100644 kcov-38/tests/shared-library/solib.c
 delete mode 100644 kcov-38/tests/short-file.c
 delete mode 100644 kcov-38/tests/signals/test-signals.c
 delete mode 100644 kcov-38/tests/subdir/file.c
 delete mode 100644 kcov-38/tests/subdir2/file.c
 delete mode 100644 kcov-38/tests/subdir2/file2.c
 delete mode 100644 kcov-38/tests/test-module/Makefile
 delete mode 100644 kcov-38/tests/test-module/test_module.c
 delete mode 100644 kcov-38/tests/threads/thread-main.c
 delete mode 100644 kcov-38/tests/tools/accumulate.py
 delete mode 100644 kcov-38/tests/tools/bash.py
 delete mode 100644 kcov-38/tests/tools/bash_linux_only.py
 delete mode 100644 kcov-38/tests/tools/basic.py
 delete mode 100644 kcov-38/tests/tools/compiled.py
 delete mode 100755 kcov-38/tests/tools/dummy-python.sh
 delete mode 100644 kcov-38/tests/tools/filter.py
 delete mode 100755 kcov-38/tests/tools/parse_cobertura.py
 delete mode 100644 kcov-38/tests/tools/python.py
 delete mode 100755 kcov-38/tests/tools/run-tests
 delete mode 100644 kcov-38/tests/tools/system_mode.py
 delete mode 100644 kcov-38/tests/tools/testbase.py
 delete mode 100644 kcov-38/tests/unit-tests/CMakeLists.txt
 delete mode 100644 kcov-38/tests/unit-tests/main.cc
 delete mode 100644 kcov-38/tests/unit-tests/mocks/mock-collector.hh
 delete mode 100644 kcov-38/tests/unit-tests/mocks/mock-engine.hh
 delete mode 100644 kcov-38/tests/unit-tests/mocks/mock-reporter.hh
 delete mode 100644 kcov-38/tests/unit-tests/second-source.c
 delete mode 100644 kcov-38/tests/unit-tests/test-source.c
 delete mode 100644 kcov-38/tests/unit-tests/test.hh
 delete mode 100644 kcov-38/tests/unit-tests/tests-collector.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-configuration.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-elf.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-filter.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-merge-parser.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-reporter.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-system-mode.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-utils.cc
 delete mode 100644 kcov-38/tests/unit-tests/tests-writer.cc
 delete mode 100644 kcov-38/tools/CMakeLists.txt
 delete mode 100644 kcov-38/tools/line2addr.cc
 delete mode 100644 kcov-38/travis/Makefile
 delete mode 100755 kcov-38/travis/perf-test.sh

diff --git a/kcov-38/.dockerignore b/kcov-38/.dockerignore
deleted file mode 100644
index 6a6e01c108cb..000000000000
--- a/kcov-38/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Dockerfile
-build
diff --git a/kcov-38/.gitignore b/kcov-38/.gitignore
deleted file mode 100644
index d824ba11c26a..000000000000
--- a/kcov-38/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.o
-*~
-*.pyc
-*.pyo
-*.cmd
-.tmp_versions
-*.ko
-*.symvers
-*.order
-*.mod.c
-kcov
-build
-obj-*/
diff --git a/kcov-38/.gitmodules b/kcov-38/.gitmodules
deleted file mode 100644
index 4177d127eb92..000000000000
--- a/kcov-38/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "tests/unit-tests/trompeloeil"]
-	path = tests/unit-tests/trompeloeil
-	url = https://github.com/rollbear/trompeloeil.git
diff --git a/kcov-38/.travis.yml b/kcov-38/.travis.yml
deleted file mode 100644
index 3892f43a2108..000000000000
--- a/kcov-38/.travis.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Build matrix / environment variable are explained on:
-# http://about.travis-ci.org/docs/user/build-configuration/
-# This file can be validated on:
-# http://lint.travis-ci.org/
-
-sudo: required
-dist: trusty
-
-before_install: make -f travis/Makefile prepare_environment
-
-os:
-  - linux
-  - osx
-
-language: cpp
-compiler:
-  - gcc
-  - clang
-
-
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "WG/iday4nudNJ9acP/gjjuXzI0Jw0MN0zP9JA3WueMvMV0UrVRnBKM+papB06XiB4Gyiaoy92pfOGzmby0ciMAvydBn2DyuGZhM1nXuEIbkQqfP3AR3z6nCZHY27NAhVnpnEAyb56FwD353JMVZj34cnRmcjgKArMM3Y8W66Zls="
-   # This, and before_script, is taken from from https://github.com/umlaeute/Gem
-   - COVERITY_SCAN_BRANCH_PATTERN="master"
-   - COVERITY_SCAN_NOTIFICATION_EMAIL="simon.kagstrom@gmail.com"
-   - COVERITY_SCAN_BUILD_COMMAND_PREPEND="mkdir -p coverity-build && cd coverity-build && cmake .. && cd .."
-   - COVERITY_SCAN_BUILD_COMMAND="make -C coverity-build"
-   - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
-
-
-before_script:
-    - mkdir -p coverity-build && cd coverity-build && cmake .. && cd ..
-    - if [[ "x${CC}" = "xclang" ]] ; then curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash || true ; fi
-
-
-script: make -f travis/Makefile run-tests
-
-notifications:
-  recipients:
-    - simon.kagstrom@gmail.com
-  email:
-    on_success: change
-    on_failure: always
-
diff --git a/kcov-38/CMakeLists.txt b/kcov-38/CMakeLists.txt
deleted file mode 100644
index a71af0072b4b..000000000000
--- a/kcov-38/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-cmake_minimum_required (VERSION 2.8.4)
-project (kcov)
-
-set (PROJECT_VERSION_MAJOR 35)
-set (PROJECT_VERSION_MINOR 0)
-set (PROJECT_VERSION_PATCH 0)
-set (PROJECT_VERSION
-     "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-if (POLICY CMP0042)
-  # MACOSX_RPATH is enabled by default.
-  cmake_policy (SET CMP0042 NEW)
-endif (POLICY CMP0042)
-
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set (CMAKE_BUILD_TYPE Release CACHE STRING
-       "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
-       FORCE)
-  set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
-                STRINGS None Debug Release RelWithDebInfo MinSizeRel)
-endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
-add_definitions(-DPACKAGE)
-add_definitions(-DPACKAGE_VERSION)
-# ====================================
-# configuring
-# ====================================
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-option (SPECIFY_RPATH  "Specify RPATH for installed executables" OFF)
-mark_as_advanced (SPECIFY_RPATH)
-
-# ====================================
-# default install paths for targets
-# ====================================
-include (CPack.local.cmake OPTIONAL)
-
-set (KCOV_INSTALL_BINDIR "bin" CACHE STRING "Install destination for user executables")
-set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for documentation")
-set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation")
-mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR)
-
-install (FILES ChangeLog COPYING COPYING.externals
-         DESTINATION "${KCOV_INSTALL_DOCDIR}")
-
-# ====================================
-# build all
-# ====================================
-add_subdirectory (src)
-add_subdirectory (doc)
diff --git a/kcov-38/CONTRIBUTING.md b/kcov-38/CONTRIBUTING.md
deleted file mode 100644
index 3c6330e097f3..000000000000
--- a/kcov-38/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Contributing to Kcov
-
-Contributors are welcome!
-
-## Patch acceptance process
-
-* If the contribution is a fix to a bug report or an issue, prefix the commit
-  message with Issue #xxx
-
-* Submit a pull request via github
-
-* There is some documentation about the design in the doc/ subdirectory
diff --git a/kcov-38/COPYING b/kcov-38/COPYING
deleted file mode 100644
index d159169d1050..000000000000
--- a/kcov-38/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/kcov-38/COPYING.externals b/kcov-38/COPYING.externals
deleted file mode 100644
index 4f206baaa144..000000000000
--- a/kcov-38/COPYING.externals
+++ /dev/null
@@ -1,3 +0,0 @@
-handlebars.js: MIT
-tablesorter (mottie): GPLv2 or MIT
-jquery: MIT
diff --git a/kcov-38/CPack.local.cmake b/kcov-38/CPack.local.cmake
deleted file mode 100644
index d6baacb1ab95..000000000000
--- a/kcov-38/CPack.local.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# ====================================
-# cpack settings
-# ====================================
-set (CPACK_PACKAGE_VERSION_MAJOR  ${PROJECT_VERSION_MAJOR})
-set (CPACK_PACKAGE_VERSION_MINOR  ${PROJECT_VERSION_MINOR})
-set (CPACK_PACKAGE_VERSION_PATCH  ${PROJECT_VERSION_PATCH})
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code coverage tester based on Bcov")
-set (CPACK_PACKAGE_DESCRIPTION_FILE  "${PROJECT_SOURCE_DIR}/README")
-set (CPACK_RESOURCE_FILE_LICENSE  "${PROJECT_SOURCE_DIR}/COPYING")
-set (CPACK_RESOURCE_FILE_README  "${PROJECT_SOURCE_DIR}/README")
-set (CPACK_PACKAGE_VENDOR  "Simon Kagstrom")
-set (CPACK_PACKAGE_CONTACT "Simon Kagstrom <simon.kagstrom@gmail.com>")
-set (CPACK_STRIP_FILES ON)
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
-set (CPACK_SOURCE_IGNORE_FILES
-  /Debug/  /Release/  /build/
-  /.git/  /.gitignore
-  .*~  .*.log
-)
-
-set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
-    /usr/share/man /usr/share/man/man1
-    /usr/local/share/man /usr/local/share/man/man1)
-
-set (CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set (CPACK_DEBIAN_PACKAGE_HOMEPAGE https://simonkagstrom.github.io/kcov/)
-
-include (CPack)
diff --git a/kcov-38/ChangeLog b/kcov-38/ChangeLog
deleted file mode 100644
index 8bbafa566391..000000000000
--- a/kcov-38/ChangeLog
+++ /dev/null
@@ -1,740 +0,0 @@
-Kcov (38):
-	* Issue #267: Fix hang on Aarch64 (Julian Stecklina)
-
-    -- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jan 17 12:10:17 CET 2020
-
-Kcov (37):
-    * Issue #312: Avoid unaligned access warnings for merged data
-      (Didri Boukelmoune)
-
-    * Issue #309: Correct encoding for non-english charsets (Zhenwei Ding)
-
-    * Issues #307, #308: Python 3 cleanup (Didri Boukelmoune)
-
-    * Issue #304: Bash: Correct PS4 parsing (Koichi Nakashima)
-
-    * Issues #295, #296: Comply with Cobertura coverage-04.dtd (Arnaud Botella)
-
-    * Issues #292, #294 : bash: Correct peek_file, xtrace-fd handling (kimkim19642004)
-
-    * Issues #282, #286, #287 Lots of build system fixes (Jamie Snape,
-      Akos Somfai)
-
-    * Issue #285: Cobertura schema fixed
-
-    * Issue #279: Rust: #[should_panic] files are now ignored
-
-    * Issue #274: Automated docker builds (Manuel Mendez)
-
-    * Issues #268, #310: A Debian packate file has been added (Paul Dreik)
-
-    * Issue #190: Code style changed to K&R
-
-    -- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Oct  1 09:14:07 CEST 2019
-
-Kcov (36):
-    * Issue #253: Kcov has been ported to FreeBSD (Alan Somers)
-
-    * Issue #243: ptrace build fixes (Leo Gaspard)
-
-    * Issue #245: Major cmake build system fixes (Jamie Snape)
-
-    * Issue #250: Improve checks for Python command
-
-    * Issue #259: Use --include-pattern in merge mode
-
-    * Issue #166: Fix make-based builds on OSX
-
-    * Issue #157: OSX now supports covering shared libraries
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Aug 23 12:46:49 CEST 2018
-
-Kcov (35):
-	* Issue #240: Allow running on systems with > 32/64 CPUs
-	  (Alexandra Ghecenco)
-
-	* Issue #178: Fix build for Aarch64 (Dridi Boukelmoune)
-
-	* Issue #223: Add --clean to make turn off accumulation
-
-	* Issue #224: Show uncovered scripts in bash reports
-
-	* Only build the system daemon if libelf isn't available
-
-	* Issue #208: Allow covering multiple binaries with the same name
-	  in the same report
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Apr 19 20:22:30 CEST 2018
-
-Kcov (34):
-	* Issue #215: Correct build with binutils >= 2.29
-
-	* Issue #216: Don't use SIGUNUSED (Dridi Boukelmoune)
-
-	* Issue #211: Avoid blocking bash write (Mike Bland)
-
-	* Issue #198: Correct skipped breakpoint count
-
-	* Issue #92: kcov can now perform full-system instrumentation via a
-	  daemon and statically instrumented binaries
-
-	* Issue #193: Handle all available bash output (Ashley Straw)
-
-	* Issue #187: Fix crash regression due to address verifier changes
-
-	* Issue #166, Issue #209: Describe workaround for OSX build problems
-
-	* Issue #183: python: Quote argument strings to avoid argv issues (Bashkar Rana)
-
-	* Unit tests build again
-
-	* Issue #165: bash: Provide basic parser mode to workaround bugs in the
-	  parser
-
-	* Issue #178: Port to AArch64 (though untested!)
-
-	* Issue #180: kcov now honors LCOV_EXCL_LINE/START/STOP, so that regions of
-	  code can be excluded from the report. Command-line options can also set
-	  custom patterns (Me, Keith Wansbrough)
-
-	* Issue #175: kcov can now ignore unreachable lines (Thomas Neumann)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Sep 10 13:11:34 CEST 2017
-
-Kcov (33):
-	* Issue #167: Writers: Add pure JSON writer for gitlabCI (http://gitlab.com)
-	  integration (Bryce Fisher-Fleig)
-
-	* Issue #162: Use Xcode build in addtion to Make for Travis
-
-	* Issue #163: Correct attaching to processes which create threads (ptrace)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jan 13 09:59:53 CET 2017
-
-Kcov (32):
-	* Issue #135: Covering binaries on OSX is now possible as well!
-
-	* Issue #114, Issue #150, Kcov also works with codecov without changes!
-
-	* Issue #152, Issue #154: bash: Correct handling heredoc special cases
-
-	* Re-enable coverity for Travis CI builds again
-
-	* Issue #148: Correct handling of PTRACE events (Niklas Ögren)
-
-	* Issue #139: Create kcov-solib.pipe in a tempdir if out-dir is unfifoable
-
-	* Issue #141: Make [merged] name configurable via --configure
-
-	* Issue #138: Allow setting a different css file via --configure
-
-	* Issue #140: Allow specifying command name via --configure
-
-	* Issue #144: Allow setting configuration options manually with --configure
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Nov 22 12:32:41 CET 2016
-
-Kcov (31):
-	* Exit with 0 when running --version (Pietro Monteiro)
-
-	* travis: Run regression tests on OS X as well
-
-	* Issue #130: bash: Correct handling of data accumulation with absolute paths
-
-	* Issue #127: Add output support for the SonarQube coverage plugin
-
-	* Refactor travis tests to use pyunit instead of Robot Framework
-
-	* Allow --repace-src when running with --merge
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Apr 17 09:42:12 CEST 2016
-
-Kcov (30):
-	* Issue #121: Add --version to display the current kcov version
-
-	* Issue #119: Allow merged output to serve as input to another merge
-	  session
-
-	* Issue #21: Allow builds on Mac OSX as well (Python and Bash only)
-
-	* Issue #122: Fix memory leak when adding shared libraries (jba31)
-
-	* Issue #118: Correct merging of reports collected on another machine
-
-	* Issue #116/#117: bash: Correct corner-cases for herecdocs and arithmetic
-	  (Phil Whineray)
-
-	* Fix various spelling errors (Veres Lajos)
-
-	* Issue #110: Correct handling of vfork()
-
-	* --pid= requires an executable, actually say that as well (Vincent Gibert)
-
-	* Issue #105: Warn about --verify without binutils
-
-	* Issue #104: Correct handling of shared libraries with build-id debug
-	  information
-
-	* Fix --skip-solibs handling
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Nov 27 06:51:40 CET 2015
-
-kcov (29):
-	* Tagged v28 by mistake :-)
-
-Kcov (28):
-	* Don't report each invalid breakpoint on --verify (give a summary instead)
-
-	* Issue #103: html: Display error message if JavaScript is disabled in
-	  the browser 
-
-	* Issue #101: Fix regression which caused --collect-only to work only
-	  if the source code was available.
-
-	* Coveralls: Use source_digest instead of source (current API?)
-
-	* Issue #99: Add support for looking up debug info from .gnu_debuglink
-	  sections (Vincent Brillault)
-
-	* Issue #98: Show execution order in the HTML output and add headings for
-	  the source view
-
-	* Issue #26: Don't warn for non-existing ELFs (typically linux-vdso.so.1)
-
-	* Issue #91: Correctly generate [merged] output after running two programs
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Jul  4 05:16:21 CEST 2015
-
-Kcov (27):
-	* Issue #90: coveralls: Publish merged results if available
-
-	* Issue #88: bash: Correct handling of ${var#}
-
-	* Issue #87: Allow coveralls uploads when using --merge (Ricardo Martins)
-
-	* Issue #86: Fix build on distros with Python 3 as default (David Barnett)
-
-	* python: Improve handling of some corner-cases for '''-strings
-
-	* Issue #76: bash: Handle multi-line quoted strings
-
-	* Issue #60: Add --merge option to merge output of multiple runs (i.e.,
-	  what the kcov-merge script did, but now integrated)
-
-	* Issue #81: Make --include-path= combined with --include-pattern=
-	  coexist more naturally (i.e., consider both)
-
-	* Lookup realpath of the paths passed to --include/exclude-path=
-
-	* Issue #18: Add --verify option that checks that all breakpoints are
-	  set on proper addresses (i.e., instruction boundaries)
-
-	* Issue #80: Fix coverage accumulation for PIE executables
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri May  1 19:44:04 CEST 2015
-
-Kcov (26):
-	* Issue #77: Collect coverage for Position-Independent Executables
-	 (Kang Seonghoon)
-
-	* Issue #72: Don't crash on filenames <3 characters long (Kang Seonghoon)
-
-	* Issue #71: Don't skip instructions on SIGSTOP (unbreaks PowerPC)
-
-	* Issue #70: bash: Handle $# ad ${#var ..} (not comments)
-
-	* Issue #66: bash: Unbreak handling of arithmetic shifts (conflict with
-	  heredocs)
-
-	* Issue #65: merge-parser: Don't panic on non-existing files (e.g., if moved)
-
-	* Issue #64: bash: Always parse the file given on the command line
-
-	* Issue #63: bash: Correct check for empty braces
-
-	* Issue #62: bash: Check for balenced parenthesis (e.g., in cases)
-
-	* Issue #51: bash: Collect coverage for #!/bin/sh executables via preloading
-	  (off by default)
-
-	* bash: Add ability to use DEBUG trap instead of PS4 (off by default, not
-	  stable)
-
-	* Unbreak accumulation (for certain programs)
-
-	* Fix hanging regression introduced in v23 (don't take solib semaphore
-	  before open/read)
-
-	* Report file-not-found or file-not-executable errors more clearly
-
-	* Issue #61: bash-engine: Output trace data via BASH_XTRACEFD when possible
-	  (bash >= 4.2) and filter stdout to catch redirections otherwise
-
-	* Issue #58: Lookup program in $PATH if it's not given on the command line
-
-	* Issue #57: bash-engine: Correct handling of quoted multiline variables
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Mar 17 19:16:46 CET 2015
-
-Kcov (25):
-	* Make database files smaller by storing only executed addresses
-
-	* Issue #52: Don't include bash-helper.sh in the output
-
-	* Issue #54: Implement handling of coverage accumulation for shared
-	  libraries
-	  
-	* Issue #50: Make sure that Bash "heredoc" markers are words
-	
-	* Fix some failure handling coverity errors
-	  
-	* Issue #49 (WIP): Implement broken gcov engine (multiple issues still pending)
-
-	* Refactor configuration handling to be more generic (avoid setters,
-	  use key/value pairs via strings instead)
-	
-	* Add "capabilities" class to make parts of the implementation clearer
-	  
-	* HTML-writer: Correct off-by-one access to static data
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Feb 10 19:38:04 CET 2015
-
-Kcov (24):
-	* Misc performance improvements here and there
-
-	* Build: Use the travis-ci.org build service to make tests more
-	  reliable.
-
-	* Unbreak Python and Bash coverage collection on 32-bit builds
-
-	* Correct clang build (well, in Fedora 20 it still fails)
-
-	* Issue #43: Clarify elfutils dependency
-
-	* Issue #46: Add support for uploading to coveralls.io via the
-	 --coveralls-id=<travis-id-or-repo_token> option
-
-	* Issue #45: Bash: Fix coverage collection when executing sub-scripts as
-	  programs.
-
-	* Issue #31: Fix handling of attaching to pid in a multithreaded process.
-	  Implementation taken from GDB: kcov now loops through all threads in
-	  a process and attaches to each one.
-
-	* Issue #44: Bash: Fix issues with <<< redirection, which were parsed
-	  as here documents
-
-	* Update the HTML/Cobertura output to display single-shot, limited and
-	  unlimited output in a logical way
-
-	* Allow three hit modes for parsers/engines: Single-shot (covered or not,
-	  as in the merge parser), limited (as in ptrace) and unlimited (line
-	  execution count used in Python/Bash)
-
-	* Remove some ptrace-specific stuff from the Engine interface
-
-	* Document classes better
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jan  5 09:46:29 CET 2015
-
-Kcov (23):
-	* Correct use-after-free case when the solib thread is killed
-
-	* Default to 5s output interval to avoid costly write-to-disk sessions
-	  too often
-
-	* Performance improvements for the Cobertura writer by reducing the amount
-	  of string operations
-
-	* Add a kcov-merge command which merges data from multiple kcov
-	  directories into a single report (Chris Love)
-
-	* Issue #39: Reduce the amount of extra output files by using filename
-	  as a tie breaker instead of file data.
-
-	* Issue #38: Fix several bugs which caused merged output to miss data
-	  present in the regular output
-
-	* Issue #37: Correct coverage accumulation for Python/bash
-
-	* Issue #36: Collect coverage from dlopen:ed libraries (through unconditional
-	  breakpoints in the dlopen call). Should also improve reliability of
-	  general shared library coverage collection
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Dec  2 20:42:04 CET 2014
-
-
-Kcov (22):
-	* Issue #35: Support installation RPATH for build (Chris Love)
-
-	* Issue #32: Fix problems when running Python unittest modules
-
-	* Various coverity resource leak fixes
-
-	* Peek into files to improve performance for matching (also see Issue #33)
-
-	* Break out solib handling from ptrace (not really related)
-
-	* Improve ptrace performance a bit, while also simplifying code
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Wed Oct 29 12:58:18 CET 2014
-
-Kcov (21):
-	* Fix regression for coverage-of-32-bit-binaries-on-64-bit-systems introduced
-	  in kcov 20
-
-	* Slightly better file stat caching (slight performance improvement)
-
-	* Avoid outputting merged cobertura output for single coverage runs
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Thu Aug  7 20:00:20 CEST 2014
-
-Kcov (20):
-	* Issue #25: Fix starvation bug where long report generation time could starve
-	  the actual application. The bug was caused by a timestamp issue.
-
-	* Issue #18: Provide explanation and possible workaround for SIGILL problems
-	  with GCC 4.1.2
-
-	* Issue #23: Warn if a binary has no debug symbols
-
-	* Replace std::list/std::map with std::list/std::unordered_map where possible
-	  (slight performance improvement)
-
-	* Remove C++11 constructs (auto, nullptr, range-based for-loops) to allow
-	  building with older compilers
-
-	* Correct bug in --report-only (crash in ptrace upon termination)
-
-	* Slight performance improvement and simplification in the lineid code
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Aug  4 12:57:19 CEST 2014
-
-Kcov (19):
-	* bash coverage: Implemented support for collecting shell script
-	  (sh/bash) coverage! Loosely based on shcov, which is now deprecated
-	  because of this
-
-	* html-writer: Correct executable lines/covered lines in the summary
-	  (was wrong in some cases)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jun 30 18:30:37 CEST 2014
-
-Kcov (18):
-	* Performance: Improve performance by cacheing realpath()
-
-	* HTML: Always put merged results last and don't include them in sorting
-
-	* HTML: Coloring improvements (?) of the HTML output
-
-	* HTML: Refactor HTML output completely to use javascript-based pages.
-	  This allows selecting how to sort directly from the web page,
-	  and greatly simplifies the generating C++ code
-
-	* Correct filtering bug in the merged output, where the last
-	  run would filter out data from the previous runs
-
-	* Issue #20: Fix hanging-on-killed-by-signal
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jun  9 19:12:38 CEST 2014
-
-Kcov (17):
-	* Issue #19: Fix bug where kcov would let children which called
-	  setpgid live even after terminating kcov itself (Oliver)
-
-	* Issue #16: Output: Implement a merged mode, which shows a
-	  combination of all covered programs under the [merged] link
-
-	* Fix an HTML output bug introduced in kcov 14 where the summary
-	  counts in the index page would be wrong.
-
-	* Issue #15: Fix a crash when source lines are > ~2000 characters long
-
-	* Issue #17: Fix parsing of multiple include/exclude patterns
-	  (Jamie Kirkpatrick)
-
-	* Split usage in common/uncommon options
-
-	* Improve unit tests and robot framework tests
-
-	* Various work on the kernel-engine and general refactoring
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun May 18 19:24:14 CEST 2014
-
-Kcov (16):
-	* kernel-engine: Implement an engine to handle kernel code coverage
-	  collection (not finished)
-
-	* kprobe-coverage: Refactor the kernel module so that it basically
-	  works now
-
-	* Code refactoring and more C++11-izing
-
-	* Python: Filter out some false negatives (i.e., non-executable
-	  lines marked as red)
-
-	* Python: Report absolute paths so that output filtering works
-
-	* Python: Catch exceptions in the python helper to avoid EOF etc
-	  being propagated upwards (and coverage collection to fail)
-
-	* Python: Fix a case where the engine would simply hang on waiting
-	  for more data
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Mar 21 16:38:28 CET 2014
-
-
-Kcov (15):
-	* Workaround a shared-library issue where kcov would sometimes hang on
-	  the malloc. The workaround uses a static memory buffer instead.
-
-	* Implemented support for collecting Python code coverage! Usage is the
-	  same as for compiled code.
-
-	* Code-restructuring to allow multiple "engines", which makes it possible
-	  to add the python support above.
-
-	* More C++11-izing of the code
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Mar  2 10:50:00 CET 2014
-
-
-Kcov (14):
-	* Add two options, --collect-only and --report-only to only collect
-	  coverage and produce Cobertura/HTML output respectively. Can be
-	  used for example on embedded systems where the source code isn't
-	  available.
-
-	* PowerPC support has been added (thanks to Aleksandr Vilchinskii and
-	  Konstantin Polivtsev for testing this)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Wed Feb  5 19:42:03 CET 2014
-
-
-Kcov (13):
-	* Don't hang the kcov main process if a breakpoint comes in
-	  before the solib handler constructor has executed (depends on
-	  the construction order)
-
-	* Correct bug with realloc in solib handling (malloc all
-	  data once only)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Dec  8 19:34:37 CET 2013
-
-Kcov (12):
-	* Fix lockup bug in the solib code path (where processes with
-	  many solibs would hang at startup)
-
-	* Correct a crash in the reporter
-
-	* Add test case for signals
-
-	* Report from main thread to avoid threading issues
-	
-	* Fairly major refactoring of ptrace code to avoid an issue
-	  where two PTRACE_CONTINUE calls could be done without
-	  waitpid() in between. This would cause crashes in the
-	  traced program.
-
-	* Add support for looking for debug info in separate files
-	  via build-id (Alexander Larsson)
-
-	* Add --exit-first-process option to fork kcov when covering
-	  daemons (otherwise kcov will wait for all children to finish)
-
-	* Add --skip-solibs option to disable processing of shared
-	  libraries, which also works around a bug which sometimes
-	  triggers 
-
-	* Add --replace-source-path option for cases where the sources
-	  have been moved (James Warner)
-
-	* Fix linking (Igor Murzov) 
-
-	* Some build fixes to make it build with clang++
-
-	* Fix various warnings
-
-	* Add experimental profiler based on kcov
-
-	* Add sorting by reverse-percent (high -> low, -u option)
-
-	* Cache non-existing files to avoid doing lstat calls all the
-	  time (slight performance improvement)
-
-	* closedir() was not called from the html-writer, which creates
-	  a resource leak (Karl Vogel)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Oct 19 11:06:42 CEST 2013
-	
-
-Kcov (11):
-	* Fix handling of common paths in HTML writer
-
-	* Fix bug in shared library handling where repeated exec()s would
-	  cause strange hangs. Fixed by unsetting the KCOV_SOLIB_PATH environment
-	  variable after the first executable has been started.
-	  Add test-popen test case to check for this.
-
-	* Expand ~'s in the --include-path and --exclude-path options
-
-	* Unbreak accumulating data from multiple runs again (introduced
-	  sometime during refactoring), and add test case for this
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Aug 18 08:45:03 CEST 2012
-
-Kcov (10):
-	* Fix bug where multiple files with the same name would only be shown
-	  once in the HTML output.
-
-	* Fix icache conflict bug (present while instrumenting shared libraries)
-	  on multi-CPU systems by forcing all traced processes to one CPU
-
-	* Re-enable the --pid=PID argument to trace a running process again
-
-	* Fix race condition in the reporter
-
-	* Only set breakpoints in executable sections. This avoids problems where
-	  the DWARF line information points to non-code sections (which can happen)
-
-	* Fix coverage reporting of orphaned children (where the parent does not
-	  wait(2) for the child
-
-	* Use std::unordered_map for breakpoints (improves performance somewhat)
-
-	* Improve unit tests
-
-	* Add robot-framework testsuite that can be run from a Jenkins server
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Mon Jul 23 13:28:43 CEST 2012
-	
-Kcov (9):
-	* Completely refactor the source code (yes, everything!), and add
-	  unit tests to verify kcov itself. The code is now in C++.
-	  
-	* Implement transparent coverage instrumentation for shared libraries
-	  (done automatically)
-	  
-	* Implement a Cobertura-compatible XML backend. This allows integrating
-	  kcov coverage information in Jenkins.
-	  
-	* Improve performance a lot by filtering out files already at the
-	  instrumentation step (and not only during HTML generation). This
-	  means that --include-pattern/--include-path can improve kcov performance
-	  by quite a bit.
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Fri Jun 15 17:39:17 CEST 2012
-
-Kcov (8):
-	* Import the man-page from Debian and update it.
-
-	* Simplify parts of the ptrace code
-
-	* Correct the sorting of files-by-percentage when the difference
-	  is less than 0.5% (thanks Martin!).
-
-	* Correct the percentage-bar color according to the configured
-	  limits in the report.
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Dec  4 14:13:47 CET 2011
-
-Kcov (7):
-	* Weed out common parts of source paths from the report, display
-	  the full path as the HTML title= tag
-
-	* Fix crash bug in argument passing
-
-	* Handle hit count a bit better
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, 2011-07-10
-
-Kcov (6):
-	* Correct hit count. The hit count is no longer over the number of
-	  possible hits
-
-	* Better error reporting when stripped or otherwise broken binaries
-	  are passed to kcov
-
-	* Handle files with relative directory paths (lookup the absolute
-	  path via DWARF source files). Otherwise, some files are not reported
-	  in the output.
-
-	* Add test program to detect regressions
-
-	* Detect stripped binaries and report that you'll need to build
-	  with -g
-
-	* Correct --include/exclude-path behavior. The previous version
-	  will match PATH*/* instead of just PATH/* (Igor Murzov)
-	  
-	* Various small fixes 
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Apr 16 08:28:27 CEST 2011
-
-Kcov (5):
-	* Switch from libdwarf to libdw (from elfutils) for building
-	  kcov. libdw is a bit more logical than libdwarf.
-	  
-	* Implement actual path matching (Igor Murzov)
-
-	* Rename path-matching to pattern matching (which is what it does)
-	  and set it up using long options.
-
-	* Parse options with getopt
-
-	* Don't escape all multibyte characters in the report. That will
-	  break display of UTF-8 etc (Igor Murzov)
-
-	* Improve cmake packaging support (Igor Murzov)
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Feb 12 15:25:57 CET 2011
-
-Kcov (4):
-	* Build system is now based on cmake (Igor Murzov)
-
-	* Add MIPS32, ARM and PowerPC architecture support. This is untested though
-	  and might very well not work at all. 
-	  
-	* Add -t option to set the title of the program to test (otherwise it
-	  will be the filename) 
-
-	* Refactored the architecture support to allow running i386 programs
-	  on x86_64 machines, and easier add other architectures
-
-	* Make it possible to collect coverage from multiple programs in a
-	  single directory, useful for example when running a test suite
-
-	* Add coverage color to the header as well
-
-	* Misc refactoring  
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Dec  7 18:20:28 CET 2010
-
-Kcov (3):
-	* Various bug fixes
-
-	* Add ability to trace running processes by PID
-
-	* Fix copyright headers
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Nov 13 08:13:03 CET 2010
-
-Kcov (2):
-	* Misc fixes
-
-	* Add ability to specify low/high limits
-
-	* Add state saving between runs. Re-starting the same program
-	  will then add to existing coverage instead of starting from
-	  scratch.
-
-	* Link to web page in the report
-
-	* Add option to sort by percentage or file name
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Oct 24 09:15:39 CEST 2010
-
-Kcov (1):
-	* Initial release
-
-	-- Simon Kagstrom <simon.kagstrom@gmail.com>
diff --git a/kcov-38/Dockerfile b/kcov-38/Dockerfile
deleted file mode 100644
index e7eeee550b35..000000000000
--- a/kcov-38/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM debian:stable-slim AS builder
-
-RUN apt-get update && \
-    apt-get install -y \
-        binutils-dev \
-        build-essential \
-        cmake \
-        git \
-        libcurl4-openssl-dev \
-        libdw-dev \
-        libiberty-dev \
-        ninja-build \
-        python3 \
-        zlib1g-dev \
-        ;
-
-ADD . /src/
-
-RUN mkdir /src/build && \
-    cd /src/build && \
-    cmake -G 'Ninja' .. && \
-    cmake --build . && \
-    cmake --build . --target install
-
-FROM debian:stable-slim
-
-RUN apt-get update && \
-    apt-get install -y \
-        binutils \
-        libcurl4 \
-        libdw1 \
-        zlib1g \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=builder /usr/local/bin/kcov* /usr/local/bin/
-COPY --from=builder /usr/local/share/doc/kcov /usr/local/share/doc/kcov
-
-CMD ["/usr/local/bin/kcov"]
diff --git a/kcov-38/INSTALL.md b/kcov-38/INSTALL.md
deleted file mode 100644
index 1de3f0f3f352..000000000000
--- a/kcov-38/INSTALL.md
+++ /dev/null
@@ -1,94 +0,0 @@
-
-## *Building Kcov*
-
-Installing dependencies
-=======================
-You need development headers and libraries for libstdc++, curl, elfutils
-and (optional) binutils and libiberty to build kcov. Note that elfutils is
-found in multiple variants, and at least in RH/Centos/Fedora you'll need
-elfutils-devel and *not* elfutils-libelf-devel.
-
-FreeBSD
--------
-pkg install binutils cmake elfutils python
-
-Ubuntu
-------
-Install binutils-dev libcurl4-openssl-dev zlib1g-dev libdw-dev libiberty-dev
-
-
-Fedora / Centos / RHEL
-----------------------
-Install elfutils-libelf-devel libcurl-devel binutils-devel elfutils-devel
-
-Mac OS X
---------
-brew install zlib bash cmake pkgconfig
-
-*Temporary* OSX build instructions due to Issue #166:
-
-Create an empty build dir and do the following steps:
-
-```
-  cd <build-dir>
-  cmake -G Xcode <path/to/kcov/source/dir>
-  xcodebuild -target kcov -configuration Release
-```
-
-The binary will be `src/Release/kcov`
-
-Building
-========
-
-Create an empty build dir and do the following steps:
-
-    cmake [options] <path/to/kcov/source/dir>
-    make
-    make install
-
-Useful options include -DCMAKE_INSTALL_PREFIX=<path> (installation prefix),
--DCMAKE_BUILD_TYPE=<type> and -DCMAKE_C_FLAGS=<CFLAGS>.
-
-Basic example:
-
-```
-    cd /path/to/kcov/source/dir
-    mkdir build
-    cd build
-    cmake ..
-    make
-    make install
-```
-
-More advanced example:
-
-```
-    cd /path/to/kcov/source/dir
-    mkdir build
-    cd build
-    cmake \
-      -DCMAKE_C_FLAGS:STRING="-O3 -march=i686" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      ..
-    make -j2 || exit 1
-    make install DESTDIR=/tmp/kcov-build || exit 1
-```
-
-For further information refer to cmake documentation:
-    http://www.cmake.org/cmake/help/cmake-2-8-docs.html.
-
-
-Troubleshooting
-===============
-
-If you have elfutils installed, but cmake fails to find it, specify elfutils
-install prefix explicitly to cmake. Here is an example:
-
-```
-    cd kcov
-    CMAKE_PREFIX_PATH=/opt/elfutils-dir/ \
-    cmake .
-    make
-    make install
-```
diff --git a/kcov-38/README b/kcov-38/README
deleted file mode 120000
index 42061c01a1c7..000000000000
--- a/kcov-38/README
+++ /dev/null
@@ -1 +0,0 @@
-README.md
\ No newline at end of file
diff --git a/kcov-38/README.md b/kcov-38/README.md
deleted file mode 100644
index 21e4a289818f..000000000000
--- a/kcov-38/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-[![Build Status](https://travis-ci.org/SimonKagstrom/kcov.svg?branch=master)](https://travis-ci.org/SimonKagstrom/kcov)
-[![Coveralls coverage status](https://img.shields.io/coveralls/SimonKagstrom/kcov.svg)](https://coveralls.io/r/SimonKagstrom/kcov?branch=master)
-[![Codecov coverage status](https://codecov.io/gh/SimonKagstrom/kcov/branch/master/graph/badge.svg)](https://codecov.io/gh/SimonKagstrom/kcov)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/2844/badge.svg)](https://scan.coverity.com/projects/2844)
-![Docker Build Status](https://img.shields.io/docker/build/kcov/kcov.svg)
-![MicroBadger Size](https://img.shields.io/microbadger/image-size/kcov/kcov.svg)
-![Docker Pulls](https://img.shields.io/docker/pulls/kcov/kcov.svg)
-
-[![PayPal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=simon.kagstrom%40gmail%2ecom&lc=US&item_name=Simon%20Kagstrom&item_number=kcov&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![Github All Releases](https://img.shields.io/github/downloads/atom/atom/total.svg)](https://github.com/SimonKagstrom/kcov/)
-
-## *kcov*
-Kcov is a FreeBSD/Linux/OSX code coverage tester for compiled languages, Python
-and Bash.  Kcov was originally a fork of [Bcov](http://bcov.sf.net), but has
-since evolved to support a large feature set in addition to that of Bcov.
-
-Kcov, like Bcov, uses DWARF debugging information for compiled programs to
-make it possible to collect coverage information without special compiler
-switches.
-
-For a video introduction, [look at this presentation from SwedenCPP](https://www.youtube.com/watch?v=1QMHbp5LUKg)
-
-Installing
-----------
-Refer to the [INSTALL](INSTALL.md) file for build instructions, or use our official Docker images:
-
-* [kcov/kcov](https://hub.docker.com/r/kcov/kcov/) for releases since v31.
-
-_Note:_
-
-_Tags v31-v33 are re-tags of [ragnaroek/kcov](https://hub.docker.com/r/ragnaroek/kcov/) which were not automated builds._
-
-_Tags v34-v35 are non automated builds using the Dockerfile in master with 1 minor [modification](https://github.com/SimonKagstrom/kcov/pull/274#issuecomment-432827976)._
-
-_Tag v36 is a non automated build using the Dockerfile in master._
-
-
-
-
-How to use it
--------------
-Basic usage is straight-forward:
-
-```
-kcov /path/to/outdir executable [args for the executable]
-```
-
-*/path/to/outdir* will contain lcov-style HTML output generated
-continuously while the application runs. Kcov will also write cobertura-
-compatible XML output and can upload coverage data directly to
-http://coveralls.io for easy integration with travis-ci. A generic
-coverage.json report is also generated which contains summaries for a given
-binary and each source file.
-
-Filtering output
-----------------
-It's often useful to filter output, since e.g., /usr/include is seldom of interest.
-This can be done in two ways:
-
-```
-kcov --exclude-pattern=/usr/include --include-pattern=part/of/path,other/path \
-      /path/to/outdir executable
-```
-
-which will do a string-comparison and include everything which contains
-*part/of/path* or *other/path* but exclude everything that has the
-*/usr/include* string in it.
-
-```
-kcov --include-path=/my/src/path /path/to/outdir executable
-kcov --exclude-path=/usr/include /path/to/outdir executable
-```
-
-Does the same thing, but with proper path lookups.
-
-Use from continuous integration systems
----------------------------------------
-kcov is easy to integrate with [travis-ci](http://travis-ci.org) together with
-[coveralls.io](http://coveralls.io) or [codecov.io](http://codecov.io). It can also
-be used from Jenkins, [SonarQube](http://sonarqube.org) and [GitLab CI](http://gitlab.com).
-Refer to
-
-* [coveralls](doc/coveralls.md) for details about travis-ci + coveralls, or
-* [codecov](doc/codecov.md) for details about travis-ci + codecov
-* [jenkins](doc/jenkins.md) for details about how to integrate in Jenkins
-* [sonarqube](doc/sonarqube.md) for how to use kcov and sonarqube together
-* [gitlab](doc/gitlab.md) for use with GitLab
-
-Full-system instrumentation
----------------------------
-Kcov can instrument all binaries with very low overhead for embedded systems.
-Refer to the [full system instrumentation](doc/full-system-instrumentation.md) documentation for details.
-
-More information
-----------------
-kcov is written by Simon Kagstrom <simon.kagstrom@gmail.com> and more
-information can be found at [the web page](http://simonkagstrom.github.com/kcov/index.html)
diff --git a/kcov-38/cmake/FindBfd.cmake b/kcov-38/cmake/FindBfd.cmake
deleted file mode 100644
index 7b588a8188d5..000000000000
--- a/kcov-38/cmake/FindBfd.cmake
+++ /dev/null
@@ -1,85 +0,0 @@
-# - Try to find libbfd
-# Once done this will define
-#
-#  LIBBFD_FOUND - system has libbfd
-#  LIBBFD_INCLUDE_DIRS - the libbfd include directory
-#  LIBBFD_LIBRARIES - Link these to use libbfd
-#  LIBBFD_DEFINITIONS - Compiler switches required for using libbfd
-#
-# Based on:
-#
-#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-if (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
-  set (LIBBFD_FIND_QUIETLY ON)
-endif (LIBBFD_LIBRARIES AND LIBBFD_INCLUDE_DIRS)
-
-find_path (LIBBFD_INCLUDE_DIRS
-    NAMES
-      bfd.h
-      dis-asm.h
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /opt/include
-      ENV CPATH)
-
-# Ugly, yes ugly...
-find_library (LIBBFD_BFD_LIBRARY
-    NAMES
-      bfd
-    PATHS
-      /usr/lib
-      /usr/lib64
-      /usr/local/lib
-      /usr/local/lib64
-      /opt/local/lib
-      /opt/usr/lib64
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-find_library (LIBBFD_IBERTY_LIBRARY
-    NAMES
-      iberty
-    PATHS
-      /usr/lib
-      /usr/lib64
-      /usr/local/lib
-      /usr/local/lib64
-      /opt/local/lib
-      /opt/usr/lib64
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-find_library (LIBBFD_OPCODES_LIBRARY
-    NAMES
-      opcodes
-    PATHS
-      /usr/lib
-      /usr/lib64
-      /usr/local/lib
-      /usr/local/lib64
-      /opt/local/lib
-      /opt/usr/lib64
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-
-include (FindPackageHandleStandardArgs)
-
-
-# handle the QUIETLY and REQUIRED arguments and set LIBBFD_FOUND to TRUE if all listed variables are TRUE
-find_package_handle_standard_args(LIBBFD DEFAULT_MSG
-    LIBBFD_BFD_LIBRARY
-    LIBBFD_IBERTY_LIBRARY
-    LIBBFD_OPCODES_LIBRARY
-    LIBBFD_INCLUDE_DIRS)
-
-mark_as_advanced(LIBBFD_INCLUDE_DIRS LIBBFD_LIBRARIES)
diff --git a/kcov-38/cmake/FindElfutils.cmake b/kcov-38/cmake/FindElfutils.cmake
deleted file mode 100644
index eefae5e3586a..000000000000
--- a/kcov-38/cmake/FindElfutils.cmake
+++ /dev/null
@@ -1,77 +0,0 @@
-# - Try to find libdwarf
-# Once done this will define
-#
-#  LIBDWARF_FOUND - system has libdwarf
-#  LIBDWARF_INCLUDE_DIRS - the libdwarf include directory
-#  LIBDWARF_LIBRARIES - Link these to use libdwarf
-#  LIBDWARF_DEFINITIONS - Compiler switches required for using libdwarf
-#
-
-# Locate libelf library at first
-if (NOT LIBELF_FOUND)
-   find_package (LibElf)
-endif (NOT LIBELF_FOUND)
-
-if (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
-  set (LibDwarf_FIND_QUIETLY ON)
-endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
-
-find_package(PkgConfig QUIET)
-
-if(PKG_CONFIG_FOUND)
-  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
-  pkg_check_modules(PC_LIBDW QUIET libdw)
-endif()
-
-find_path (DWARF_INCLUDE_DIR
-    NAMES
-      dwarf.h
-    HINTS
-      ${PC_LIBDW_INCLUDE_DIRS}
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      ENV CPATH) # PATH and INCLUDE will also work
-find_path (LIBDW_INCLUDE_DIR
-    NAMES
-      elfutils/libdw.h
-    HINTS
-      ${PC_LIBDW_INCLUDE_DIRS}
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      ENV CPATH)
-if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR)
-    set (LIBDWARF_INCLUDE_DIRS  ${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
-endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR)
-
-find_library (LIBDW_LIBRARY
-    NAMES
-      dw
-    HINTS
-      ${PC_LIBDW_LIBRARY_DIRS}
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-      ENV LIBRARY_PATH   # PATH and LIB will also work
-      ENV LD_LIBRARY_PATH)
-
-include (FindPackageHandleStandardArgs)
-
-
-# handle the QUIETLY and REQUIRED arguments and set LIBDWARF_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(ElfUtils DEFAULT_MSG
-    LIBDW_LIBRARY
-    LIBDW_INCLUDE_DIR)
-
-mark_as_advanced(LIBDW_INCLUDE_DIR LIBDW_LIBRARY)
-
-set(LIBDW_LIBRARIES ${LIBDW_LIBRARY} )
-set(LIBDW_INCLUDE_DIRS ${LIBDW_INCLUDE_DIR} )
diff --git a/kcov-38/cmake/FindLibCRPCUT.cmake b/kcov-38/cmake/FindLibCRPCUT.cmake
deleted file mode 100644
index 0cddba98953c..000000000000
--- a/kcov-38/cmake/FindLibCRPCUT.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# - Try to find libcrpcut
-# Once done this will define
-#
-#  LIBCRPCUT_FOUND - system has libcrpcut
-#  LIBCRPCUT_INCLUDE_DIRS - the libcrpcut include directory
-#  LIBCRPCUT_LIBRARIES - Link these to use libcrpcut
-#  LIBCRPCUT_DEFINITIONS - Compiler switches required for using libcrpcut
-#
-# Based on:
-#
-#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-if (LIBCRPCUT_LIBRARIES AND LIBCRPCUT_INCLUDE_DIRS)
-  set (LibCRPCUT_FIND_QUIETLY ON)
-endif (LIBCRPCUT_LIBRARIES AND LIBCRPCUT_INCLUDE_DIRS)
-
-find_path (LIBCRPCUT_INCLUDE_DIRS
-    NAMES
-      crpcut.hpp
-    PATHS
-      /usr/include
-      /usr/include/crpcut
-      /usr/local/include
-      /usr/local/include/crpcut
-      /opt/local/include
-      /opt/local/include/crpcut
-      /home/ska/local/include
-      ENV CPATH)
-
-find_library (LIBCRPCUT_LIBRARIES
-    NAMES
-      crpcut
-    PATHS
-      /usr/lib
-      /usr/lib64
-      /usr/local/lib
-      /usr/local/lib64
-      /opt/local/lib
-      /opt/usr/lib64
-      /home/ska/local/lib
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-include (FindPackageHandleStandardArgs)
-
-
-# handle the QUIETLY and REQUIRED arguments and set LIBCRPCUT_FOUND to TRUE if all listed variables are TRUE
-find_package_handle_standard_args(LibCRPCUT DEFAULT_MSG
-    LIBCRPCUT_LIBRARIES
-    LIBCRPCUT_INCLUDE_DIRS)
-
-
-mark_as_advanced(LIBCRPCUT_INCLUDE_DIRS LIBCRPCUT_LIBRARIES)
diff --git a/kcov-38/cmake/FindLibElf.cmake b/kcov-38/cmake/FindLibElf.cmake
deleted file mode 100644
index c1c1901d4dbc..000000000000
--- a/kcov-38/cmake/FindLibElf.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-# - Try to find libelf
-# Once done this will define
-#
-#  LIBELF_FOUND - system has libelf
-#  LIBELF_INCLUDE_DIRS - the libelf include directory
-#  LIBELF_LIBRARIES - Link these to use libelf
-#  LIBELF_DEFINITIONS - Compiler switches required for using libelf
-#
-#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-if (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
-  set (LibElf_FIND_QUIETLY ON)
-endif (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
-
-find_package(PkgConfig QUIET)
-
-if(PKG_CONFIG_FOUND)
-  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
-  pkg_check_modules(PC_LIBELF QUIET libelf)
-endif()
-
-find_path (LIBELF_INCLUDE_DIR
-    NAMES
-      libelf.h
-    HINTS
-      ${PC_LIBELF_INCLUDE_DIRS}
-    PATHS
-      /usr/include
-      /usr/include/libelf
-      /usr/local/include
-      /usr/local/include/libelf
-      /opt/local/include
-      /opt/local/include/libelf
-      /sw/include
-      /sw/include/libelf
-      ENV CPATH)
-
-find_library (LIBELF_LIBRARY
-    NAMES
-      elf
-    HINTS
-      ${PC_LIBELF_LIBRARY_DIRS}
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-      ENV LIBRARY_PATH
-      ENV LD_LIBRARY_PATH)
-
-include (FindPackageHandleStandardArgs)
-
-
-# handle the QUIETLY and REQUIRED arguments and set LIBELF_FOUND to TRUE if all listed variables are TRUE
-find_package_handle_standard_args(LibElf DEFAULT_MSG
-    LIBELF_LIBRARY
-    LIBELF_INCLUDE_DIR)
-
-
-mark_as_advanced(LIBELF_INCLUDE_DIR LIBELF_LIBRARY)
-
-set(LIBELF_LIBRARIES ${LIBELF_LIBRARY} )
-set(LIBELF_INCLUDE_DIRS ${LIBELF_INCLUDE_DIR} )
diff --git a/kcov-38/cmake/TargetArch.cmake b/kcov-38/cmake/TargetArch.cmake
deleted file mode 100644
index 46e17557be33..000000000000
--- a/kcov-38/cmake/TargetArch.cmake
+++ /dev/null
@@ -1,134 +0,0 @@
-# Based on the Qt 5 processor detection code, so should be very accurate
-# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
-# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
-
-# Regarding POWER/PowerPC, just as is noted in the Qt source,
-# "There are many more known variants/revisions that we do not handle/detect."
-
-set(archdetect_c_code "
-#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
-    #if defined(__ARM_ARCH_7__) \\
-        || defined(__ARM_ARCH_7A__) \\
-        || defined(__ARM_ARCH_7R__) \\
-        || defined(__ARM_ARCH_7M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
-        #error cmake_ARCH armv7
-    #elif defined(__ARM_ARCH_6__) \\
-        || defined(__ARM_ARCH_6J__) \\
-        || defined(__ARM_ARCH_6T2__) \\
-        || defined(__ARM_ARCH_6Z__) \\
-        || defined(__ARM_ARCH_6K__) \\
-        || defined(__ARM_ARCH_6ZK__) \\
-        || defined(__ARM_ARCH_6M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
-        #error cmake_ARCH armv6
-    #elif defined(__ARM_ARCH_5TEJ__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
-        #error cmake_ARCH armv5
-    #else
-        #error cmake_ARCH arm
-    #endif
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-    #error cmake_ARCH i386
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-    #error cmake_ARCH x86_64
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-    #error cmake_ARCH ia64
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
-      || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \\
-      || defined(_M_MPPC) || defined(_M_PPC)
-    #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-        #error cmake_ARCH ppc64
-    #else
-        #error cmake_ARCH ppc
-    #endif
-#endif
-
-#error cmake_ARCH unknown
-")
-
-# Set ppc_support to TRUE before including this file or ppc and ppc64
-# will be treated as invalid architectures since they are no longer supported by Apple
-
-function(target_architecture output_var)
-    if(APPLE AND CMAKE_OSX_ARCHITECTURES)
-        # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
-        # First let's normalize the order of the values
-
-        # Note that it's not possible to compile PowerPC applications if you are using
-        # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
-        # disable it by default
-        # See this page for more information:
-        # http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
-
-        # Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
-        # On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
-
-        foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
-            if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
-                set(osx_arch_ppc ON)
-            elseif("${osx_arch}" STREQUAL "i386")
-                set(osx_arch_i386 ON)
-            elseif("${osx_arch}" STREQUAL "x86_64")
-                set(osx_arch_x86_64 ON)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 ON)
-            else()
-                message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
-            endif()
-        endforeach()
-
-        # Now add all the architectures in our normalized order
-        if(osx_arch_ppc)
-            list(APPEND ARCH ppc)
-        endif()
-
-        if(osx_arch_i386)
-            list(APPEND ARCH i386)
-        endif()
-
-        if(osx_arch_x86_64)
-            list(APPEND ARCH x86_64)
-        endif()
-
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
-        endif()
-    else()
-        file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
-
-        enable_language(C)
-
-        # Detect the architecture in a rather creative way...
-        # This compiles a small C program which is a series of ifdefs that selects a
-        # particular #error preprocessor directive whose message string contains the
-        # target architecture. The program will always fail to compile (both because
-        # file is not a valid C program, and obviously because of the presence of the
-        # #error preprocessor directives... but by exploiting the preprocessor in this
-        # way, we can detect the correct target architecture even when cross-compiling,
-        # since the program itself never needs to be run (only the compiler/preprocessor)
-        try_run(
-            run_result_unused
-            compile_result_unused
-            "${CMAKE_BINARY_DIR}"
-            "${CMAKE_BINARY_DIR}/arch.c"
-            COMPILE_OUTPUT_VARIABLE ARCH
-            CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-        )
-
-        # Parse the architecture name from the compiler output
-        string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
-
-        # Get rid of the value marker leaving just the architecture name
-        string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
-
-        # If we are compiling with an unknown architecture this variable should
-        # already be set to "unknown" but in the case that it's empty (i.e. due
-        # to a typo in the code), then set it to unknown
-        if (NOT ARCH)
-            set(ARCH unknown)
-        endif()
-    endif()
-
-    set(${output_var} "${ARCH}" PARENT_SCOPE)
-endfunction()
diff --git a/kcov-38/data/amber.png b/kcov-38/data/amber.png
deleted file mode 100644
index 2cab170d8359081983a4e343848dfe06bc490f12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga>?NMQuI!iC1^G2tW}LqE04T&+
z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`1M1^9%x{(levWG<?@RR^TFJY5_^
cDsCkw0NG3oj8E0?f%GwWy85}Sb4q9e09Jz{aR2}S

diff --git a/kcov-38/data/bcov.css b/kcov-38/data/bcov.css
deleted file mode 100644
index ea9ff66a6fd0..000000000000
--- a/kcov-38/data/bcov.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Based upon the lcov CSS style, style files can be reused */
-body { color: #000000; background-color: #FFFFFF; }
-a:link { color: #284FA8; text-decoration: underline; }
-a:visited { color: #00CB40; text-decoration: underline; }
-a:active { color: #FF0040; text-decoration: underline; }
-td.title { text-align: center; padding-bottom: 10px; font-size: 20pt; font-weight: bold; }
-td.ruler { background-color: #6688D4; }
-td.headerItem { text-align: right; padding-right: 6px; font-family: sans-serif; font-weight: bold; }
-td.headerValue { text-align: left; color: #284FA8; font-family: sans-serif; font-weight: bold; }
-td.versionInfo { text-align: center; padding-top:  2px; }
-th.headerItem { text-align: right; padding-right: 6px; font-family: sans-serif; font-weight: bold; }
-th.headerValue { text-align: left; color: #284FA8; font-family: sans-serif; font-weight: bold; }
-pre.source { font-family: monospace; white-space: pre; overflow: hidden; text-overflow: ellipsis; }
-span.lineNum { background-color: #EFE383; }
-span.lineNumLegend { background-color: #EFE383; width: 96px; font-weight: bold ;}
-span.lineCov { background-color: #adff9a; }
-span.linePartCov { background-color: #fffe80; }
-span.lineNoCov { background-color: #ffbbbb; }
-span.orderNum { background-color: #e0b373; float: right; width:5em; text-align: left; }
-span.orderNumLegend { background-color: #e0b373; width: 96px; font-weight: bold ;}
-span.coverHits { background-color: #DFE383;  padding-left: 3px; padding-right: 1px;  text-align: right; list-style-type: none; display: inline-block; width: 5em; }
-span.coverHitsLegend { background-color: #DFE383; width: 96px; font-weight: bold; margin: 0 auto;}
-td.tableHead { text-align: center; color: #FFFFFF; background-color: #6688D4; font-family: sans-serif; font-size: 120%; font-weight: bold; }
-td.coverFile { text-align: left; padding-left: 10px; padding-right: 20px; color: #284FA8; font-family: monospace; }
-td.coverBar { padding-left: 10px; padding-right: 10px; background-color: #DAE7FE; }
-td.coverBarOutline { background-color: #000000; }
-td.coverPer { text-align: left; padding-left: 10px; padding-right: 10px; font-weight: bold; }
-td.coverPerLeftMed { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #fffe80; font-weight: bold; }
-td.coverPerLeftLo { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #ffbbbb; font-weight: bold; }
-td.coverPerLeftHi { text-align: left; padding-left: 10px; padding-right: 10px; background-color: #adff9a; font-weight: bold; }
-td.coverNum { text-align: right; padding-left: 10px; padding-right: 10px; }
-td.coverNum { text-align: right; padding-left: 10px; padding-right: 10px; }
diff --git a/kcov-38/data/glass.png b/kcov-38/data/glass.png
deleted file mode 100644
index e1abc00680a3093c49fdb775ae6bdb6764c95af2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6;R0X`wF
z|Ns97GD8ntt^-nxB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gf+eGhVt|_XjA*
zUgGKN%6^Gmn4d%Ph(nkFP>9RZ#WAE}PI3Z}&BVayv3^M*kj3EX>gTe~DWM4f=_Dpv

diff --git a/kcov-38/data/index.html b/kcov-38/data/index.html
deleted file mode 100644
index 9611abb0ad7a..000000000000
--- a/kcov-38/data/index.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title id="window-title">???</title>
-  <link rel="stylesheet" href="data/tablesorter-theme.css">
-  <link rel="stylesheet" type="text/css" href="data/bcov.css"/>
-</head>
-
-<noscript>
-<font color=red><B>ERROR:</B></font> JavaScript need to be enabled for the coverage report to work.
-</noscript>
-
-<script type="text/javascript" src="index.js"></script>
-<script type="text/javascript" src="data/js/jquery.min.js"></script>
-<script type="text/javascript" src="data/js/tablesorter.min.js"></script>
-<script type="text/javascript" src="data/js/jquery.tablesorter.widgets.min.js"></script>
-<script type="text/javascript" src="data/js/handlebars.js"></script>
-<script type="text/javascript" src="data/js/kcov.js"></script>
-<body>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr><td class="title">Coverage Report</td></tr>
-  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
-  <tr>
-    <td width="100%">
-      <table cellpadding="1" border="0" width="100%">
-        <tr id="command">
-          <td class="headerItem" width="20%">Command:</td>
-          <td id="header-command" class="headerValue" width="80%" colspan=6>???</td>
-        </tr>
-        <tr>
-          <td class="headerItem" width="20%">Date: </td>
-          <td id="header-date" class="headerValue" width="15%"></td>
-          <td width="5%"></td>
-          <td class="headerItem" width="20%">Instrumented lines:</td>
-          <td id="header-instrumented" class="headerValue" width="10%">???</td>
-        </tr>
-        <tr>
-          <td class="headerItem" width="20%">Code covered:</td>
-          <td id="header-percent-covered" width="15%">???</td>
-          <td width="5%"></td>
-          <td class="headerItem" width="20%">Executed lines:</td>
-          <td id="header-covered" class="headerValue" width="10%">???</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
-</table>
-
-
-<script id="files-template" type="text/x-handlebars-template">
-<center>
-  <table width="80%" cellpadding="2" cellspacing="1" border="0" id="index-table" class="tablesorter">
-    <thead>
-    <tr>
-      <th class="tableHead" width="50%">Filename</th>
-      <th width="20%">Coverage percent</th>
-      <th width="10%">Covered lines</th>
-      <th width="10%">Uncovered lines</th>
-      <th width="10%">Executable lines</th>
-    </tr>
-    </thead>
-    <tbody id="main-data">
-    {{#each files}}
-    <tr>
-      <td class="coverFile"><a href="{{link}}" title="{{title}}">{{summary_name}}</a></td>
-      <td class="coverPer"><span style="display:block;width:{{covered}}%" class="{{covered_class}}">{{covered}}%</td>
-      <td class="coverNum">{{covered_lines}}</td>
-      <td class="coverNum">{{uncovered_lines}}</td>
-      <td class="coverNum">{{total_lines}}</td>
-    </tr>
-    {{/each}}
-    </tbody>
-    {{#each merged_files}}
-    <tbody tablesorter-no-sort id="merged-data">
-    <tr>
-      <td class="coverFile"><a href="{{link}}" title="{{title}}">{{summary_name}}</a></td>
-      <td class="coverPer"><span style="display:block;width:{{covered}}%" class="{{covered_class}}">{{covered}}%</td>
-      <td class="coverNum">{{covered_lines}}</td>
-      <td class="coverNum">{{uncovered_lines}}</td>
-      <td class="coverNum">{{total_lines}}</td>
-    </tr>
-    </tbody>
-    {{/each}}
-  </table>
-</center>
-</script>
-<div id="files-placeholder"></div>
-
-<br>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr><td class="ruler"><img src="data/amber.png" width="3" height="3" alt=""/></td></tr>
-  <tr><td class="versionInfo">Generated by: <a href="http://simonkagstrom.github.com/kcov/index.html">Kcov</a></td></tr>
-</table>
-</body>
-</html>
diff --git a/kcov-38/data/js/handlebars.js b/kcov-38/data/js/handlebars.js
deleted file mode 100644
index 1f7d2654a724..000000000000
--- a/kcov-38/data/js/handlebars.js
+++ /dev/null
@@ -1,3079 +0,0 @@
-/*!
-
- handlebars v2.0.0
-
-Copyright (C) 2011-2014 by Yehuda Katz
-
-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.
-
-@license
-*/
-/* exported Handlebars */
-(function (root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define([], factory);
-  } else if (typeof exports === 'object') {
-    module.exports = factory();
-  } else {
-    root.Handlebars = root.Handlebars || factory();
-  }
-}(this, function () {
-// handlebars/safe-string.js
-var __module4__ = (function() {
-  "use strict";
-  var __exports__;
-  // Build out our basic SafeString type
-  function SafeString(string) {
-    this.string = string;
-  }
-
-  SafeString.prototype.toString = function() {
-    return "" + this.string;
-  };
-
-  __exports__ = SafeString;
-  return __exports__;
-})();
-
-// handlebars/utils.js
-var __module3__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__ = {};
-  /*jshint -W004 */
-  var SafeString = __dependency1__;
-
-  var escape = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#x27;",
-    "`": "&#x60;"
-  };
-
-  var badChars = /[&<>"'`]/g;
-  var possible = /[&<>"'`]/;
-
-  function escapeChar(chr) {
-    return escape[chr];
-  }
-
-  function extend(obj /* , ...source */) {
-    for (var i = 1; i < arguments.length; i++) {
-      for (var key in arguments[i]) {
-        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
-          obj[key] = arguments[i][key];
-        }
-      }
-    }
-
-    return obj;
-  }
-
-  __exports__.extend = extend;var toString = Object.prototype.toString;
-  __exports__.toString = toString;
-  // Sourced from lodash
-  // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
-  var isFunction = function(value) {
-    return typeof value === 'function';
-  };
-  // fallback for older versions of Chrome and Safari
-  /* istanbul ignore next */
-  if (isFunction(/x/)) {
-    isFunction = function(value) {
-      return typeof value === 'function' && toString.call(value) === '[object Function]';
-    };
-  }
-  var isFunction;
-  __exports__.isFunction = isFunction;
-  /* istanbul ignore next */
-  var isArray = Array.isArray || function(value) {
-    return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
-  };
-  __exports__.isArray = isArray;
-
-  function escapeExpression(string) {
-    // don't escape SafeStrings, since they're already safe
-    if (string instanceof SafeString) {
-      return string.toString();
-    } else if (string == null) {
-      return "";
-    } else if (!string) {
-      return string + '';
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = "" + string;
-
-    if(!possible.test(string)) { return string; }
-    return string.replace(badChars, escapeChar);
-  }
-
-  __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
-    if (!value && value !== 0) {
-      return true;
-    } else if (isArray(value) && value.length === 0) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) {
-    return (contextPath ? contextPath + '.' : '') + id;
-  }
-
-  __exports__.appendContextPath = appendContextPath;
-  return __exports__;
-})(__module4__);
-
-// handlebars/exception.js
-var __module5__ = (function() {
-  "use strict";
-  var __exports__;
-
-  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-  function Exception(message, node) {
-    var line;
-    if (node && node.firstLine) {
-      line = node.firstLine;
-
-      message += ' - ' + line + ':' + node.firstColumn;
-    }
-
-    var tmp = Error.prototype.constructor.call(this, message);
-
-    // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-    for (var idx = 0; idx < errorProps.length; idx++) {
-      this[errorProps[idx]] = tmp[errorProps[idx]];
-    }
-
-    if (line) {
-      this.lineNumber = line;
-      this.column = node.firstColumn;
-    }
-  }
-
-  Exception.prototype = new Error();
-
-  __exports__ = Exception;
-  return __exports__;
-})();
-
-// handlebars/base.js
-var __module2__ = (function(__dependency1__, __dependency2__) {
-  "use strict";
-  var __exports__ = {};
-  var Utils = __dependency1__;
-  var Exception = __dependency2__;
-
-  var VERSION = "2.0.0";
-  __exports__.VERSION = VERSION;var COMPILER_REVISION = 6;
-  __exports__.COMPILER_REVISION = COMPILER_REVISION;
-  var REVISION_CHANGES = {
-    1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-    2: '== 1.0.0-rc.3',
-    3: '== 1.0.0-rc.4',
-    4: '== 1.x.x',
-    5: '== 2.0.0-alpha.x',
-    6: '>= 2.0.0-beta.1'
-  };
-  __exports__.REVISION_CHANGES = REVISION_CHANGES;
-  var isArray = Utils.isArray,
-      isFunction = Utils.isFunction,
-      toString = Utils.toString,
-      objectType = '[object Object]';
-
-  function HandlebarsEnvironment(helpers, partials) {
-    this.helpers = helpers || {};
-    this.partials = partials || {};
-
-    registerDefaultHelpers(this);
-  }
-
-  __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
-    constructor: HandlebarsEnvironment,
-
-    logger: logger,
-    log: log,
-
-    registerHelper: function(name, fn) {
-      if (toString.call(name) === objectType) {
-        if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-        Utils.extend(this.helpers, name);
-      } else {
-        this.helpers[name] = fn;
-      }
-    },
-    unregisterHelper: function(name) {
-      delete this.helpers[name];
-    },
-
-    registerPartial: function(name, partial) {
-      if (toString.call(name) === objectType) {
-        Utils.extend(this.partials,  name);
-      } else {
-        this.partials[name] = partial;
-      }
-    },
-    unregisterPartial: function(name) {
-      delete this.partials[name];
-    }
-  };
-
-  function registerDefaultHelpers(instance) {
-    instance.registerHelper('helperMissing', function(/* [args, ]options */) {
-      if(arguments.length === 1) {
-        // A missing field in a {{foo}} constuct.
-        return undefined;
-      } else {
-        // Someone is actually trying to call something, blow up.
-        throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
-      }
-    });
-
-    instance.registerHelper('blockHelperMissing', function(context, options) {
-      var inverse = options.inverse,
-          fn = options.fn;
-
-      if(context === true) {
-        return fn(this);
-      } else if(context === false || context == null) {
-        return inverse(this);
-      } else if (isArray(context)) {
-        if(context.length > 0) {
-          if (options.ids) {
-            options.ids = [options.name];
-          }
-
-          return instance.helpers.each(context, options);
-        } else {
-          return inverse(this);
-        }
-      } else {
-        if (options.data && options.ids) {
-          var data = createFrame(options.data);
-          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
-          options = {data: data};
-        }
-
-        return fn(context, options);
-      }
-    });
-
-    instance.registerHelper('each', function(context, options) {
-      if (!options) {
-        throw new Exception('Must pass iterator to #each');
-      }
-
-      var fn = options.fn, inverse = options.inverse;
-      var i = 0, ret = "", data;
-
-      var contextPath;
-      if (options.data && options.ids) {
-        contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-      }
-
-      if (isFunction(context)) { context = context.call(this); }
-
-      if (options.data) {
-        data = createFrame(options.data);
-      }
-
-      if(context && typeof context === 'object') {
-        if (isArray(context)) {
-          for(var j = context.length; i<j; i++) {
-            if (data) {
-              data.index = i;
-              data.first = (i === 0);
-              data.last  = (i === (context.length-1));
-
-              if (contextPath) {
-                data.contextPath = contextPath + i;
-              }
-            }
-            ret = ret + fn(context[i], { data: data });
-          }
-        } else {
-          for(var key in context) {
-            if(context.hasOwnProperty(key)) {
-              if(data) {
-                data.key = key;
-                data.index = i;
-                data.first = (i === 0);
-
-                if (contextPath) {
-                  data.contextPath = contextPath + key;
-                }
-              }
-              ret = ret + fn(context[key], {data: data});
-              i++;
-            }
-          }
-        }
-      }
-
-      if(i === 0){
-        ret = inverse(this);
-      }
-
-      return ret;
-    });
-
-    instance.registerHelper('if', function(conditional, options) {
-      if (isFunction(conditional)) { conditional = conditional.call(this); }
-
-      // Default behavior is to render the positive path if the value is truthy and not empty.
-      // The `includeZero` option may be set to treat the conditional as purely not empty based on the
-      // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-      if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
-        return options.inverse(this);
-      } else {
-        return options.fn(this);
-      }
-    });
-
-    instance.registerHelper('unless', function(conditional, options) {
-      return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-    });
-
-    instance.registerHelper('with', function(context, options) {
-      if (isFunction(context)) { context = context.call(this); }
-
-      var fn = options.fn;
-
-      if (!Utils.isEmpty(context)) {
-        if (options.data && options.ids) {
-          var data = createFrame(options.data);
-          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
-          options = {data:data};
-        }
-
-        return fn(context, options);
-      } else {
-        return options.inverse(this);
-      }
-    });
-
-    instance.registerHelper('log', function(message, options) {
-      var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-      instance.log(level, message);
-    });
-
-    instance.registerHelper('lookup', function(obj, field) {
-      return obj && obj[field];
-    });
-  }
-
-  var logger = {
-    methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
-
-    // State enum
-    DEBUG: 0,
-    INFO: 1,
-    WARN: 2,
-    ERROR: 3,
-    level: 3,
-
-    // can be overridden in the host environment
-    log: function(level, message) {
-      if (logger.level <= level) {
-        var method = logger.methodMap[level];
-        if (typeof console !== 'undefined' && console[method]) {
-          console[method].call(console, message);
-        }
-      }
-    }
-  };
-  __exports__.logger = logger;
-  var log = logger.log;
-  __exports__.log = log;
-  var createFrame = function(object) {
-    var frame = Utils.extend({}, object);
-    frame._parent = object;
-    return frame;
-  };
-  __exports__.createFrame = createFrame;
-  return __exports__;
-})(__module3__, __module5__);
-
-// handlebars/runtime.js
-var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
-  "use strict";
-  var __exports__ = {};
-  var Utils = __dependency1__;
-  var Exception = __dependency2__;
-  var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
-  var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
-  var createFrame = __dependency3__.createFrame;
-
-  function checkRevision(compilerInfo) {
-    var compilerRevision = compilerInfo && compilerInfo[0] || 1,
-        currentRevision = COMPILER_REVISION;
-
-    if (compilerRevision !== currentRevision) {
-      if (compilerRevision < currentRevision) {
-        var runtimeVersions = REVISION_CHANGES[currentRevision],
-            compilerVersions = REVISION_CHANGES[compilerRevision];
-        throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
-              "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
-      } else {
-        // Use the embedded version info since the runtime doesn't know about this revision yet
-        throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
-              "Please update your runtime to a newer version ("+compilerInfo[1]+").");
-      }
-    }
-  }
-
-  __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
-
-  function template(templateSpec, env) {
-    /* istanbul ignore next */
-    if (!env) {
-      throw new Exception("No environment passed to template");
-    }
-    if (!templateSpec || !templateSpec.main) {
-      throw new Exception('Unknown template object: ' + typeof templateSpec);
-    }
-
-    // Note: Using env.VM references rather than local var references throughout this section to allow
-    // for external users to override these as pseudo-supported APIs.
-    env.VM.checkRevision(templateSpec.compiler);
-
-    var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
-      if (hash) {
-        context = Utils.extend({}, context, hash);
-      }
-
-      var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
-
-      if (result == null && env.compile) {
-        var options = { helpers: helpers, partials: partials, data: data, depths: depths };
-        partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
-        result = partials[name](context, options);
-      }
-      if (result != null) {
-        if (indent) {
-          var lines = result.split('\n');
-          for (var i = 0, l = lines.length; i < l; i++) {
-            if (!lines[i] && i + 1 === l) {
-              break;
-            }
-
-            lines[i] = indent + lines[i];
-          }
-          result = lines.join('\n');
-        }
-        return result;
-      } else {
-        throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
-      }
-    };
-
-    // Just add water
-    var container = {
-      lookup: function(depths, name) {
-        var len = depths.length;
-        for (var i = 0; i < len; i++) {
-          if (depths[i] && depths[i][name] != null) {
-            return depths[i][name];
-          }
-        }
-      },
-      lambda: function(current, context) {
-        return typeof current === 'function' ? current.call(context) : current;
-      },
-
-      escapeExpression: Utils.escapeExpression,
-      invokePartial: invokePartialWrapper,
-
-      fn: function(i) {
-        return templateSpec[i];
-      },
-
-      programs: [],
-      program: function(i, data, depths) {
-        var programWrapper = this.programs[i],
-            fn = this.fn(i);
-        if (data || depths) {
-          programWrapper = program(this, i, fn, data, depths);
-        } else if (!programWrapper) {
-          programWrapper = this.programs[i] = program(this, i, fn);
-        }
-        return programWrapper;
-      },
-
-      data: function(data, depth) {
-        while (data && depth--) {
-          data = data._parent;
-        }
-        return data;
-      },
-      merge: function(param, common) {
-        var ret = param || common;
-
-        if (param && common && (param !== common)) {
-          ret = Utils.extend({}, common, param);
-        }
-
-        return ret;
-      },
-
-      noop: env.VM.noop,
-      compilerInfo: templateSpec.compiler
-    };
-
-    var ret = function(context, options) {
-      options = options || {};
-      var data = options.data;
-
-      ret._setup(options);
-      if (!options.partial && templateSpec.useData) {
-        data = initData(context, data);
-      }
-      var depths;
-      if (templateSpec.useDepths) {
-        depths = options.depths ? [context].concat(options.depths) : [context];
-      }
-
-      return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
-    };
-    ret.isTop = true;
-
-    ret._setup = function(options) {
-      if (!options.partial) {
-        container.helpers = container.merge(options.helpers, env.helpers);
-
-        if (templateSpec.usePartial) {
-          container.partials = container.merge(options.partials, env.partials);
-        }
-      } else {
-        container.helpers = options.helpers;
-        container.partials = options.partials;
-      }
-    };
-
-    ret._child = function(i, data, depths) {
-      if (templateSpec.useDepths && !depths) {
-        throw new Exception('must pass parent depths');
-      }
-
-      return program(container, i, templateSpec[i], data, depths);
-    };
-    return ret;
-  }
-
-  __exports__.template = template;function program(container, i, fn, data, depths) {
-    var prog = function(context, options) {
-      options = options || {};
-
-      return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
-    };
-    prog.program = i;
-    prog.depth = depths ? depths.length : 0;
-    return prog;
-  }
-
-  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data, depths) {
-    var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
-
-    if(partial === undefined) {
-      throw new Exception("The partial " + name + " could not be found");
-    } else if(partial instanceof Function) {
-      return partial(context, options);
-    }
-  }
-
-  __exports__.invokePartial = invokePartial;function noop() { return ""; }
-
-  __exports__.noop = noop;function initData(context, data) {
-    if (!data || !('root' in data)) {
-      data = data ? createFrame(data) : {};
-      data.root = context;
-    }
-    return data;
-  }
-  return __exports__;
-})(__module3__, __module5__, __module2__);
-
-// handlebars.runtime.js
-var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
-  "use strict";
-  var __exports__;
-  /*globals Handlebars: true */
-  var base = __dependency1__;
-
-  // Each of these augment the Handlebars object. No need to setup here.
-  // (This is done to easily share code between commonjs and browse envs)
-  var SafeString = __dependency2__;
-  var Exception = __dependency3__;
-  var Utils = __dependency4__;
-  var runtime = __dependency5__;
-
-  // For compatibility and usage outside of module systems, make the Handlebars object a namespace
-  var create = function() {
-    var hb = new base.HandlebarsEnvironment();
-
-    Utils.extend(hb, base);
-    hb.SafeString = SafeString;
-    hb.Exception = Exception;
-    hb.Utils = Utils;
-    hb.escapeExpression = Utils.escapeExpression;
-
-    hb.VM = runtime;
-    hb.template = function(spec) {
-      return runtime.template(spec, hb);
-    };
-
-    return hb;
-  };
-
-  var Handlebars = create();
-  Handlebars.create = create;
-
-  Handlebars['default'] = Handlebars;
-
-  __exports__ = Handlebars;
-  return __exports__;
-})(__module2__, __module4__, __module5__, __module3__, __module6__);
-
-// handlebars/compiler/ast.js
-var __module7__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__;
-  var Exception = __dependency1__;
-
-  function LocationInfo(locInfo) {
-    locInfo = locInfo || {};
-    this.firstLine   = locInfo.first_line;
-    this.firstColumn = locInfo.first_column;
-    this.lastColumn  = locInfo.last_column;
-    this.lastLine    = locInfo.last_line;
-  }
-
-  var AST = {
-    ProgramNode: function(statements, strip, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "program";
-      this.statements = statements;
-      this.strip = strip;
-    },
-
-    MustacheNode: function(rawParams, hash, open, strip, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "mustache";
-      this.strip = strip;
-
-      // Open may be a string parsed from the parser or a passed boolean flag
-      if (open != null && open.charAt) {
-        // Must use charAt to support IE pre-10
-        var escapeFlag = open.charAt(3) || open.charAt(2);
-        this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
-      } else {
-        this.escaped = !!open;
-      }
-
-      if (rawParams instanceof AST.SexprNode) {
-        this.sexpr = rawParams;
-      } else {
-        // Support old AST API
-        this.sexpr = new AST.SexprNode(rawParams, hash);
-      }
-
-      // Support old AST API that stored this info in MustacheNode
-      this.id = this.sexpr.id;
-      this.params = this.sexpr.params;
-      this.hash = this.sexpr.hash;
-      this.eligibleHelper = this.sexpr.eligibleHelper;
-      this.isHelper = this.sexpr.isHelper;
-    },
-
-    SexprNode: function(rawParams, hash, locInfo) {
-      LocationInfo.call(this, locInfo);
-
-      this.type = "sexpr";
-      this.hash = hash;
-
-      var id = this.id = rawParams[0];
-      var params = this.params = rawParams.slice(1);
-
-      // a mustache is definitely a helper if:
-      // * it is an eligible helper, and
-      // * it has at least one parameter or hash segment
-      this.isHelper = !!(params.length || hash);
-
-      // a mustache is an eligible helper if:
-      // * its id is simple (a single part, not `this` or `..`)
-      this.eligibleHelper = this.isHelper || id.isSimple;
-
-      // if a mustache is an eligible helper but not a definite
-      // helper, it is ambiguous, and will be resolved in a later
-      // pass or at runtime.
-    },
-
-    PartialNode: function(partialName, context, hash, strip, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type         = "partial";
-      this.partialName  = partialName;
-      this.context      = context;
-      this.hash = hash;
-      this.strip = strip;
-
-      this.strip.inlineStandalone = true;
-    },
-
-    BlockNode: function(mustache, program, inverse, strip, locInfo) {
-      LocationInfo.call(this, locInfo);
-
-      this.type = 'block';
-      this.mustache = mustache;
-      this.program  = program;
-      this.inverse  = inverse;
-      this.strip = strip;
-
-      if (inverse && !program) {
-        this.isInverse = true;
-      }
-    },
-
-    RawBlockNode: function(mustache, content, close, locInfo) {
-      LocationInfo.call(this, locInfo);
-
-      if (mustache.sexpr.id.original !== close) {
-        throw new Exception(mustache.sexpr.id.original + " doesn't match " + close, this);
-      }
-
-      content = new AST.ContentNode(content, locInfo);
-
-      this.type = 'block';
-      this.mustache = mustache;
-      this.program = new AST.ProgramNode([content], {}, locInfo);
-    },
-
-    ContentNode: function(string, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "content";
-      this.original = this.string = string;
-    },
-
-    HashNode: function(pairs, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "hash";
-      this.pairs = pairs;
-    },
-
-    IdNode: function(parts, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "ID";
-
-      var original = "",
-          dig = [],
-          depth = 0,
-          depthString = '';
-
-      for(var i=0,l=parts.length; i<l; i++) {
-        var part = parts[i].part;
-        original += (parts[i].separator || '') + part;
-
-        if (part === ".." || part === "." || part === "this") {
-          if (dig.length > 0) {
-            throw new Exception("Invalid path: " + original, this);
-          } else if (part === "..") {
-            depth++;
-            depthString += '../';
-          } else {
-            this.isScoped = true;
-          }
-        } else {
-          dig.push(part);
-        }
-      }
-
-      this.original = original;
-      this.parts    = dig;
-      this.string   = dig.join('.');
-      this.depth    = depth;
-      this.idName   = depthString + this.string;
-
-      // an ID is simple if it only has one part, and that part is not
-      // `..` or `this`.
-      this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-      this.stringModeValue = this.string;
-    },
-
-    PartialNameNode: function(name, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "PARTIAL_NAME";
-      this.name = name.original;
-    },
-
-    DataNode: function(id, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "DATA";
-      this.id = id;
-      this.stringModeValue = id.stringModeValue;
-      this.idName = '@' + id.stringModeValue;
-    },
-
-    StringNode: function(string, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "STRING";
-      this.original =
-        this.string =
-        this.stringModeValue = string;
-    },
-
-    NumberNode: function(number, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "NUMBER";
-      this.original =
-        this.number = number;
-      this.stringModeValue = Number(number);
-    },
-
-    BooleanNode: function(bool, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "BOOLEAN";
-      this.bool = bool;
-      this.stringModeValue = bool === "true";
-    },
-
-    CommentNode: function(comment, locInfo) {
-      LocationInfo.call(this, locInfo);
-      this.type = "comment";
-      this.comment = comment;
-
-      this.strip = {
-        inlineStandalone: true
-      };
-    }
-  };
-
-
-  // Must be exported as an object rather than the root of the module as the jison lexer
-  // most modify the object to operate properly.
-  __exports__ = AST;
-  return __exports__;
-})(__module5__);
-
-// handlebars/compiler/parser.js
-var __module9__ = (function() {
-  "use strict";
-  var __exports__;
-  /* jshint ignore:start */
-  /* istanbul ignore next */
-  /* Jison generated parser */
-  var handlebars = (function(){
-  var parser = {trace: function trace() { },
-  yy: {},
-  symbols_: {"error":2,"root":3,"program":4,"EOF":5,"program_repetition0":6,"statement":7,"mustache":8,"block":9,"rawBlock":10,"partial":11,"CONTENT":12,"COMMENT":13,"openRawBlock":14,"END_RAW_BLOCK":15,"OPEN_RAW_BLOCK":16,"sexpr":17,"CLOSE_RAW_BLOCK":18,"openBlock":19,"block_option0":20,"closeBlock":21,"openInverse":22,"block_option1":23,"OPEN_BLOCK":24,"CLOSE":25,"OPEN_INVERSE":26,"inverseAndProgram":27,"INVERSE":28,"OPEN_ENDBLOCK":29,"path":30,"OPEN":31,"OPEN_UNESCAPED":32,"CLOSE_UNESCAPED":33,"OPEN_PARTIAL":34,"partialName":35,"param":36,"partial_option0":37,"partial_option1":38,"sexpr_repetition0":39,"sexpr_option0":40,"dataName":41,"STRING":42,"NUMBER":43,"BOOLEAN":44,"OPEN_SEXPR":45,"CLOSE_SEXPR":46,"hash":47,"hash_repetition_plus0":48,"hashSegment":49,"ID":50,"EQUALS":51,"DATA":52,"pathSegments":53,"SEP":54,"$accept":0,"$end":1},
-  terminals_: {2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"},
-  productions_: [0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]],
-  performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-  var $0 = $$.length - 1;
-  switch (yystate) {
-  case 1: yy.prepareProgram($$[$0-1].statements, true); return $$[$0-1]; 
-  break;
-  case 2:this.$ = new yy.ProgramNode(yy.prepareProgram($$[$0]), {}, this._$);
-  break;
-  case 3:this.$ = $$[$0];
-  break;
-  case 4:this.$ = $$[$0];
-  break;
-  case 5:this.$ = $$[$0];
-  break;
-  case 6:this.$ = $$[$0];
-  break;
-  case 7:this.$ = new yy.ContentNode($$[$0], this._$);
-  break;
-  case 8:this.$ = new yy.CommentNode($$[$0], this._$);
-  break;
-  case 9:this.$ = new yy.RawBlockNode($$[$0-2], $$[$0-1], $$[$0], this._$);
-  break;
-  case 10:this.$ = new yy.MustacheNode($$[$0-1], null, '', '', this._$);
-  break;
-  case 11:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], false, this._$);
-  break;
-  case 12:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], true, this._$);
-  break;
-  case 13:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
-  break;
-  case 14:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
-  break;
-  case 15:this.$ = { strip: yy.stripFlags($$[$0-1], $$[$0-1]), program: $$[$0] };
-  break;
-  case 16:this.$ = {path: $$[$0-1], strip: yy.stripFlags($$[$0-2], $$[$0])};
-  break;
-  case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
-  break;
-  case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
-  break;
-  case 19:this.$ = new yy.PartialNode($$[$0-3], $$[$0-2], $$[$0-1], yy.stripFlags($$[$0-4], $$[$0]), this._$);
-  break;
-  case 20:this.$ = new yy.PartialNode($$[$0-2], undefined, $$[$0-1], yy.stripFlags($$[$0-3], $$[$0]), this._$);
-  break;
-  case 21:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$);
-  break;
-  case 22:this.$ = new yy.SexprNode([$$[$0]], null, this._$);
-  break;
-  case 23:this.$ = $$[$0];
-  break;
-  case 24:this.$ = new yy.StringNode($$[$0], this._$);
-  break;
-  case 25:this.$ = new yy.NumberNode($$[$0], this._$);
-  break;
-  case 26:this.$ = new yy.BooleanNode($$[$0], this._$);
-  break;
-  case 27:this.$ = $$[$0];
-  break;
-  case 28:$$[$0-1].isHelper = true; this.$ = $$[$0-1];
-  break;
-  case 29:this.$ = new yy.HashNode($$[$0], this._$);
-  break;
-  case 30:this.$ = [$$[$0-2], $$[$0]];
-  break;
-  case 31:this.$ = new yy.PartialNameNode($$[$0], this._$);
-  break;
-  case 32:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$);
-  break;
-  case 33:this.$ = new yy.PartialNameNode(new yy.NumberNode($$[$0], this._$));
-  break;
-  case 34:this.$ = new yy.DataNode($$[$0], this._$);
-  break;
-  case 35:this.$ = new yy.IdNode($$[$0], this._$);
-  break;
-  case 36: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
-  break;
-  case 37:this.$ = [{part: $$[$0]}];
-  break;
-  case 38:this.$ = [];
-  break;
-  case 39:$$[$0-1].push($$[$0]);
-  break;
-  case 48:this.$ = [];
-  break;
-  case 49:$$[$0-1].push($$[$0]);
-  break;
-  case 52:this.$ = [$$[$0]];
-  break;
-  case 53:$$[$0-1].push($$[$0]);
-  break;
-  }
-  },
-  table: [{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}],
-  defaultActions: {4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]},
-  parseError: function parseError(str, hash) {
-      throw new Error(str);
-  },
-  parse: function parse(input) {
-      var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-      this.lexer.setInput(input);
-      this.lexer.yy = this.yy;
-      this.yy.lexer = this.lexer;
-      this.yy.parser = this;
-      if (typeof this.lexer.yylloc == "undefined")
-          this.lexer.yylloc = {};
-      var yyloc = this.lexer.yylloc;
-      lstack.push(yyloc);
-      var ranges = this.lexer.options && this.lexer.options.ranges;
-      if (typeof this.yy.parseError === "function")
-          this.parseError = this.yy.parseError;
-      function popStack(n) {
-          stack.length = stack.length - 2 * n;
-          vstack.length = vstack.length - n;
-          lstack.length = lstack.length - n;
-      }
-      function lex() {
-          var token;
-          token = self.lexer.lex() || 1;
-          if (typeof token !== "number") {
-              token = self.symbols_[token] || token;
-          }
-          return token;
-      }
-      var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-      while (true) {
-          state = stack[stack.length - 1];
-          if (this.defaultActions[state]) {
-              action = this.defaultActions[state];
-          } else {
-              if (symbol === null || typeof symbol == "undefined") {
-                  symbol = lex();
-              }
-              action = table[state] && table[state][symbol];
-          }
-          if (typeof action === "undefined" || !action.length || !action[0]) {
-              var errStr = "";
-              if (!recovering) {
-                  expected = [];
-                  for (p in table[state])
-                      if (this.terminals_[p] && p > 2) {
-                          expected.push("'" + this.terminals_[p] + "'");
-                      }
-                  if (this.lexer.showPosition) {
-                      errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
-                  } else {
-                      errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                  }
-                  this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-              }
-          }
-          if (action[0] instanceof Array && action.length > 1) {
-              throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-          }
-          switch (action[0]) {
-          case 1:
-              stack.push(symbol);
-              vstack.push(this.lexer.yytext);
-              lstack.push(this.lexer.yylloc);
-              stack.push(action[1]);
-              symbol = null;
-              if (!preErrorSymbol) {
-                  yyleng = this.lexer.yyleng;
-                  yytext = this.lexer.yytext;
-                  yylineno = this.lexer.yylineno;
-                  yyloc = this.lexer.yylloc;
-                  if (recovering > 0)
-                      recovering--;
-              } else {
-                  symbol = preErrorSymbol;
-                  preErrorSymbol = null;
-              }
-              break;
-          case 2:
-              len = this.productions_[action[1]][1];
-              yyval.$ = vstack[vstack.length - len];
-              yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-              if (ranges) {
-                  yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
-              }
-              r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-              if (typeof r !== "undefined") {
-                  return r;
-              }
-              if (len) {
-                  stack = stack.slice(0, -1 * len * 2);
-                  vstack = vstack.slice(0, -1 * len);
-                  lstack = lstack.slice(0, -1 * len);
-              }
-              stack.push(this.productions_[action[1]][0]);
-              vstack.push(yyval.$);
-              lstack.push(yyval._$);
-              newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-              stack.push(newState);
-              break;
-          case 3:
-              return true;
-          }
-      }
-      return true;
-  }
-  };
-  /* Jison generated lexer */
-  var lexer = (function(){
-  var lexer = ({EOF:1,
-  parseError:function parseError(str, hash) {
-          if (this.yy.parser) {
-              this.yy.parser.parseError(str, hash);
-          } else {
-              throw new Error(str);
-          }
-      },
-  setInput:function (input) {
-          this._input = input;
-          this._more = this._less = this.done = false;
-          this.yylineno = this.yyleng = 0;
-          this.yytext = this.matched = this.match = '';
-          this.conditionStack = ['INITIAL'];
-          this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-          if (this.options.ranges) this.yylloc.range = [0,0];
-          this.offset = 0;
-          return this;
-      },
-  input:function () {
-          var ch = this._input[0];
-          this.yytext += ch;
-          this.yyleng++;
-          this.offset++;
-          this.match += ch;
-          this.matched += ch;
-          var lines = ch.match(/(?:\r\n?|\n).*/g);
-          if (lines) {
-              this.yylineno++;
-              this.yylloc.last_line++;
-          } else {
-              this.yylloc.last_column++;
-          }
-          if (this.options.ranges) this.yylloc.range[1]++;
-
-          this._input = this._input.slice(1);
-          return ch;
-      },
-  unput:function (ch) {
-          var len = ch.length;
-          var lines = ch.split(/(?:\r\n?|\n)/g);
-
-          this._input = ch + this._input;
-          this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-          //this.yyleng -= len;
-          this.offset -= len;
-          var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-          this.match = this.match.substr(0, this.match.length-1);
-          this.matched = this.matched.substr(0, this.matched.length-1);
-
-          if (lines.length-1) this.yylineno -= lines.length-1;
-          var r = this.yylloc.range;
-
-          this.yylloc = {first_line: this.yylloc.first_line,
-            last_line: this.yylineno+1,
-            first_column: this.yylloc.first_column,
-            last_column: lines ?
-                (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-                this.yylloc.first_column - len
-            };
-
-          if (this.options.ranges) {
-              this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-          }
-          return this;
-      },
-  more:function () {
-          this._more = true;
-          return this;
-      },
-  less:function (n) {
-          this.unput(this.match.slice(n));
-      },
-  pastInput:function () {
-          var past = this.matched.substr(0, this.matched.length - this.match.length);
-          return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-      },
-  upcomingInput:function () {
-          var next = this.match;
-          if (next.length < 20) {
-              next += this._input.substr(0, 20-next.length);
-          }
-          return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-      },
-  showPosition:function () {
-          var pre = this.pastInput();
-          var c = new Array(pre.length + 1).join("-");
-          return pre + this.upcomingInput() + "\n" + c+"^";
-      },
-  next:function () {
-          if (this.done) {
-              return this.EOF;
-          }
-          if (!this._input) this.done = true;
-
-          var token,
-              match,
-              tempMatch,
-              index,
-              col,
-              lines;
-          if (!this._more) {
-              this.yytext = '';
-              this.match = '';
-          }
-          var rules = this._currentRules();
-          for (var i=0;i < rules.length; i++) {
-              tempMatch = this._input.match(this.rules[rules[i]]);
-              if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                  match = tempMatch;
-                  index = i;
-                  if (!this.options.flex) break;
-              }
-          }
-          if (match) {
-              lines = match[0].match(/(?:\r\n?|\n).*/g);
-              if (lines) this.yylineno += lines.length;
-              this.yylloc = {first_line: this.yylloc.last_line,
-                             last_line: this.yylineno+1,
-                             first_column: this.yylloc.last_column,
-                             last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-              this.yytext += match[0];
-              this.match += match[0];
-              this.matches = match;
-              this.yyleng = this.yytext.length;
-              if (this.options.ranges) {
-                  this.yylloc.range = [this.offset, this.offset += this.yyleng];
-              }
-              this._more = false;
-              this._input = this._input.slice(match[0].length);
-              this.matched += match[0];
-              token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-              if (this.done && this._input) this.done = false;
-              if (token) return token;
-              else return;
-          }
-          if (this._input === "") {
-              return this.EOF;
-          } else {
-              return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                      {text: "", token: null, line: this.yylineno});
-          }
-      },
-  lex:function lex() {
-          var r = this.next();
-          if (typeof r !== 'undefined') {
-              return r;
-          } else {
-              return this.lex();
-          }
-      },
-  begin:function begin(condition) {
-          this.conditionStack.push(condition);
-      },
-  popState:function popState() {
-          return this.conditionStack.pop();
-      },
-  _currentRules:function _currentRules() {
-          return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
-      },
-  topState:function () {
-          return this.conditionStack[this.conditionStack.length-2];
-      },
-  pushState:function begin(condition) {
-          this.begin(condition);
-      }});
-  lexer.options = {};
-  lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-
-  function strip(start, end) {
-    return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end);
-  }
-
-
-  var YYSTATE=YY_START
-  switch($avoiding_name_collisions) {
-  case 0:
-                                     if(yy_.yytext.slice(-2) === "\\\\") {
-                                       strip(0,1);
-                                       this.begin("mu");
-                                     } else if(yy_.yytext.slice(-1) === "\\") {
-                                       strip(0,1);
-                                       this.begin("emu");
-                                     } else {
-                                       this.begin("mu");
-                                     }
-                                     if(yy_.yytext) return 12;
-                                   
-  break;
-  case 1:return 12;
-  break;
-  case 2:
-                                     this.popState();
-                                     return 12;
-                                   
-  break;
-  case 3:
-                                    yy_.yytext = yy_.yytext.substr(5, yy_.yyleng-9);
-                                    this.popState();
-                                    return 15;
-                                   
-  break;
-  case 4: return 12; 
-  break;
-  case 5:strip(0,4); this.popState(); return 13;
-  break;
-  case 6:return 45;
-  break;
-  case 7:return 46;
-  break;
-  case 8: return 16; 
-  break;
-  case 9:
-                                    this.popState();
-                                    this.begin('raw');
-                                    return 18;
-                                   
-  break;
-  case 10:return 34;
-  break;
-  case 11:return 24;
-  break;
-  case 12:return 29;
-  break;
-  case 13:this.popState(); return 28;
-  break;
-  case 14:this.popState(); return 28;
-  break;
-  case 15:return 26;
-  break;
-  case 16:return 26;
-  break;
-  case 17:return 32;
-  break;
-  case 18:return 31;
-  break;
-  case 19:this.popState(); this.begin('com');
-  break;
-  case 20:strip(3,5); this.popState(); return 13;
-  break;
-  case 21:return 31;
-  break;
-  case 22:return 51;
-  break;
-  case 23:return 50;
-  break;
-  case 24:return 50;
-  break;
-  case 25:return 54;
-  break;
-  case 26:// ignore whitespace
-  break;
-  case 27:this.popState(); return 33;
-  break;
-  case 28:this.popState(); return 25;
-  break;
-  case 29:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 42;
-  break;
-  case 30:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 42;
-  break;
-  case 31:return 52;
-  break;
-  case 32:return 44;
-  break;
-  case 33:return 44;
-  break;
-  case 34:return 43;
-  break;
-  case 35:return 50;
-  break;
-  case 36:yy_.yytext = strip(1,2); return 50;
-  break;
-  case 37:return 'INVALID';
-  break;
-  case 38:return 5;
-  break;
-  }
-  };
-  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-  lexer.conditions = {"mu":{"rules":[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[5],"inclusive":false},"raw":{"rules":[3,4],"inclusive":false},"INITIAL":{"rules":[0,1,38],"inclusive":true}};
-  return lexer;})()
-  parser.lexer = lexer;
-  function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-  return new Parser;
-  })();__exports__ = handlebars;
-  /* jshint ignore:end */
-  return __exports__;
-})();
-
-// handlebars/compiler/helpers.js
-var __module10__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__ = {};
-  var Exception = __dependency1__;
-
-  function stripFlags(open, close) {
-    return {
-      left: open.charAt(2) === '~',
-      right: close.charAt(close.length-3) === '~'
-    };
-  }
-
-  __exports__.stripFlags = stripFlags;
-  function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) {
-    /*jshint -W040 */
-    if (mustache.sexpr.id.original !== close.path.original) {
-      throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache);
-    }
-
-    var inverse = inverseAndProgram && inverseAndProgram.program;
-
-    var strip = {
-      left: mustache.strip.left,
-      right: close.strip.right,
-
-      // Determine the standalone candiacy. Basically flag our content as being possibly standalone
-      // so our parent can determine if we actually are standalone
-      openStandalone: isNextWhitespace(program.statements),
-      closeStandalone: isPrevWhitespace((inverse || program).statements)
-    };
-
-    if (mustache.strip.right) {
-      omitRight(program.statements, null, true);
-    }
-
-    if (inverse) {
-      var inverseStrip = inverseAndProgram.strip;
-
-      if (inverseStrip.left) {
-        omitLeft(program.statements, null, true);
-      }
-      if (inverseStrip.right) {
-        omitRight(inverse.statements, null, true);
-      }
-      if (close.strip.left) {
-        omitLeft(inverse.statements, null, true);
-      }
-
-      // Find standalone else statments
-      if (isPrevWhitespace(program.statements)
-          && isNextWhitespace(inverse.statements)) {
-
-        omitLeft(program.statements);
-        omitRight(inverse.statements);
-      }
-    } else {
-      if (close.strip.left) {
-        omitLeft(program.statements, null, true);
-      }
-    }
-
-    if (inverted) {
-      return new this.BlockNode(mustache, inverse, program, strip, locInfo);
-    } else {
-      return new this.BlockNode(mustache, program, inverse, strip, locInfo);
-    }
-  }
-
-  __exports__.prepareBlock = prepareBlock;
-  function prepareProgram(statements, isRoot) {
-    for (var i = 0, l = statements.length; i < l; i++) {
-      var current = statements[i],
-          strip = current.strip;
-
-      if (!strip) {
-        continue;
-      }
-
-      var _isPrevWhitespace = isPrevWhitespace(statements, i, isRoot, current.type === 'partial'),
-          _isNextWhitespace = isNextWhitespace(statements, i, isRoot),
-
-          openStandalone = strip.openStandalone && _isPrevWhitespace,
-          closeStandalone = strip.closeStandalone && _isNextWhitespace,
-          inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
-
-      if (strip.right) {
-        omitRight(statements, i, true);
-      }
-      if (strip.left) {
-        omitLeft(statements, i, true);
-      }
-
-      if (inlineStandalone) {
-        omitRight(statements, i);
-
-        if (omitLeft(statements, i)) {
-          // If we are on a standalone node, save the indent info for partials
-          if (current.type === 'partial') {
-            current.indent = (/([ \t]+$)/).exec(statements[i-1].original) ? RegExp.$1 : '';
-          }
-        }
-      }
-      if (openStandalone) {
-        omitRight((current.program || current.inverse).statements);
-
-        // Strip out the previous content node if it's whitespace only
-        omitLeft(statements, i);
-      }
-      if (closeStandalone) {
-        // Always strip the next node
-        omitRight(statements, i);
-
-        omitLeft((current.inverse || current.program).statements);
-      }
-    }
-
-    return statements;
-  }
-
-  __exports__.prepareProgram = prepareProgram;function isPrevWhitespace(statements, i, isRoot) {
-    if (i === undefined) {
-      i = statements.length;
-    }
-
-    // Nodes that end with newlines are considered whitespace (but are special
-    // cased for strip operations)
-    var prev = statements[i-1],
-        sibling = statements[i-2];
-    if (!prev) {
-      return isRoot;
-    }
-
-    if (prev.type === 'content') {
-      return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
-    }
-  }
-  function isNextWhitespace(statements, i, isRoot) {
-    if (i === undefined) {
-      i = -1;
-    }
-
-    var next = statements[i+1],
-        sibling = statements[i+2];
-    if (!next) {
-      return isRoot;
-    }
-
-    if (next.type === 'content') {
-      return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
-    }
-  }
-
-  // Marks the node to the right of the position as omitted.
-  // I.e. {{foo}}' ' will mark the ' ' node as omitted.
-  //
-  // If i is undefined, then the first child will be marked as such.
-  //
-  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-  // content is met.
-  function omitRight(statements, i, multiple) {
-    var current = statements[i == null ? 0 : i + 1];
-    if (!current || current.type !== 'content' || (!multiple && current.rightStripped)) {
-      return;
-    }
-
-    var original = current.string;
-    current.string = current.string.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
-    current.rightStripped = current.string !== original;
-  }
-
-  // Marks the node to the left of the position as omitted.
-  // I.e. ' '{{foo}} will mark the ' ' node as omitted.
-  //
-  // If i is undefined then the last child will be marked as such.
-  //
-  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-  // content is met.
-  function omitLeft(statements, i, multiple) {
-    var current = statements[i == null ? statements.length - 1 : i - 1];
-    if (!current || current.type !== 'content' || (!multiple && current.leftStripped)) {
-      return;
-    }
-
-    // We omit the last node if it's whitespace only and not preceded by a non-content node.
-    var original = current.string;
-    current.string = current.string.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
-    current.leftStripped = current.string !== original;
-    return current.leftStripped;
-  }
-  return __exports__;
-})(__module5__);
-
-// handlebars/compiler/base.js
-var __module8__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
-  "use strict";
-  var __exports__ = {};
-  var parser = __dependency1__;
-  var AST = __dependency2__;
-  var Helpers = __dependency3__;
-  var extend = __dependency4__.extend;
-
-  __exports__.parser = parser;
-
-  var yy = {};
-  extend(yy, Helpers, AST);
-
-  function parse(input) {
-    // Just return if an already-compile AST was passed in.
-    if (input.constructor === AST.ProgramNode) { return input; }
-
-    parser.yy = yy;
-
-    return parser.parse(input);
-  }
-
-  __exports__.parse = parse;
-  return __exports__;
-})(__module9__, __module7__, __module10__, __module3__);
-
-// handlebars/compiler/compiler.js
-var __module11__ = (function(__dependency1__, __dependency2__) {
-  "use strict";
-  var __exports__ = {};
-  var Exception = __dependency1__;
-  var isArray = __dependency2__.isArray;
-
-  var slice = [].slice;
-
-  function Compiler() {}
-
-  __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a
-  // function in a context. This is necessary for mustache compatibility, which
-  // requires that context functions in blocks are evaluated by blockHelperMissing,
-  // and then proceed as if the resulting value was provided to blockHelperMissing.
-
-  Compiler.prototype = {
-    compiler: Compiler,
-
-    equals: function(other) {
-      var len = this.opcodes.length;
-      if (other.opcodes.length !== len) {
-        return false;
-      }
-
-      for (var i = 0; i < len; i++) {
-        var opcode = this.opcodes[i],
-            otherOpcode = other.opcodes[i];
-        if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
-          return false;
-        }
-      }
-
-      // We know that length is the same between the two arrays because they are directly tied
-      // to the opcode behavior above.
-      len = this.children.length;
-      for (i = 0; i < len; i++) {
-        if (!this.children[i].equals(other.children[i])) {
-          return false;
-        }
-      }
-
-      return true;
-    },
-
-    guid: 0,
-
-    compile: function(program, options) {
-      this.opcodes = [];
-      this.children = [];
-      this.depths = {list: []};
-      this.options = options;
-      this.stringParams = options.stringParams;
-      this.trackIds = options.trackIds;
-
-      // These changes will propagate to the other compiler components
-      var knownHelpers = this.options.knownHelpers;
-      this.options.knownHelpers = {
-        'helperMissing': true,
-        'blockHelperMissing': true,
-        'each': true,
-        'if': true,
-        'unless': true,
-        'with': true,
-        'log': true,
-        'lookup': true
-      };
-      if (knownHelpers) {
-        for (var name in knownHelpers) {
-          this.options.knownHelpers[name] = knownHelpers[name];
-        }
-      }
-
-      return this.accept(program);
-    },
-
-    accept: function(node) {
-      return this[node.type](node);
-    },
-
-    program: function(program) {
-      var statements = program.statements;
-
-      for(var i=0, l=statements.length; i<l; i++) {
-        this.accept(statements[i]);
-      }
-      this.isSimple = l === 1;
-
-      this.depths.list = this.depths.list.sort(function(a, b) {
-        return a - b;
-      });
-
-      return this;
-    },
-
-    compileProgram: function(program) {
-      var result = new this.compiler().compile(program, this.options);
-      var guid = this.guid++, depth;
-
-      this.usePartial = this.usePartial || result.usePartial;
-
-      this.children[guid] = result;
-
-      for(var i=0, l=result.depths.list.length; i<l; i++) {
-        depth = result.depths.list[i];
-
-        if(depth < 2) { continue; }
-        else { this.addDepth(depth - 1); }
-      }
-
-      return guid;
-    },
-
-    block: function(block) {
-      var mustache = block.mustache,
-          program = block.program,
-          inverse = block.inverse;
-
-      if (program) {
-        program = this.compileProgram(program);
-      }
-
-      if (inverse) {
-        inverse = this.compileProgram(inverse);
-      }
-
-      var sexpr = mustache.sexpr;
-      var type = this.classifySexpr(sexpr);
-
-      if (type === "helper") {
-        this.helperSexpr(sexpr, program, inverse);
-      } else if (type === "simple") {
-        this.simpleSexpr(sexpr);
-
-        // now that the simple mustache is resolved, we need to
-        // evaluate it by executing `blockHelperMissing`
-        this.opcode('pushProgram', program);
-        this.opcode('pushProgram', inverse);
-        this.opcode('emptyHash');
-        this.opcode('blockValue', sexpr.id.original);
-      } else {
-        this.ambiguousSexpr(sexpr, program, inverse);
-
-        // now that the simple mustache is resolved, we need to
-        // evaluate it by executing `blockHelperMissing`
-        this.opcode('pushProgram', program);
-        this.opcode('pushProgram', inverse);
-        this.opcode('emptyHash');
-        this.opcode('ambiguousBlockValue');
-      }
-
-      this.opcode('append');
-    },
-
-    hash: function(hash) {
-      var pairs = hash.pairs, i, l;
-
-      this.opcode('pushHash');
-
-      for(i=0, l=pairs.length; i<l; i++) {
-        this.pushParam(pairs[i][1]);
-      }
-      while(i--) {
-        this.opcode('assignToHash', pairs[i][0]);
-      }
-      this.opcode('popHash');
-    },
-
-    partial: function(partial) {
-      var partialName = partial.partialName;
-      this.usePartial = true;
-
-      if (partial.hash) {
-        this.accept(partial.hash);
-      } else {
-        this.opcode('push', 'undefined');
-      }
-
-      if (partial.context) {
-        this.accept(partial.context);
-      } else {
-        this.opcode('getContext', 0);
-        this.opcode('pushContext');
-      }
-
-      this.opcode('invokePartial', partialName.name, partial.indent || '');
-      this.opcode('append');
-    },
-
-    content: function(content) {
-      if (content.string) {
-        this.opcode('appendContent', content.string);
-      }
-    },
-
-    mustache: function(mustache) {
-      this.sexpr(mustache.sexpr);
-
-      if(mustache.escaped && !this.options.noEscape) {
-        this.opcode('appendEscaped');
-      } else {
-        this.opcode('append');
-      }
-    },
-
-    ambiguousSexpr: function(sexpr, program, inverse) {
-      var id = sexpr.id,
-          name = id.parts[0],
-          isBlock = program != null || inverse != null;
-
-      this.opcode('getContext', id.depth);
-
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-
-      this.ID(id);
-
-      this.opcode('invokeAmbiguous', name, isBlock);
-    },
-
-    simpleSexpr: function(sexpr) {
-      var id = sexpr.id;
-
-      if (id.type === 'DATA') {
-        this.DATA(id);
-      } else if (id.parts.length) {
-        this.ID(id);
-      } else {
-        // Simplified ID for `this`
-        this.addDepth(id.depth);
-        this.opcode('getContext', id.depth);
-        this.opcode('pushContext');
-      }
-
-      this.opcode('resolvePossibleLambda');
-    },
-
-    helperSexpr: function(sexpr, program, inverse) {
-      var params = this.setupFullMustacheParams(sexpr, program, inverse),
-          id = sexpr.id,
-          name = id.parts[0];
-
-      if (this.options.knownHelpers[name]) {
-        this.opcode('invokeKnownHelper', params.length, name);
-      } else if (this.options.knownHelpersOnly) {
-        throw new Exception("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
-      } else {
-        id.falsy = true;
-
-        this.ID(id);
-        this.opcode('invokeHelper', params.length, id.original, id.isSimple);
-      }
-    },
-
-    sexpr: function(sexpr) {
-      var type = this.classifySexpr(sexpr);
-
-      if (type === "simple") {
-        this.simpleSexpr(sexpr);
-      } else if (type === "helper") {
-        this.helperSexpr(sexpr);
-      } else {
-        this.ambiguousSexpr(sexpr);
-      }
-    },
-
-    ID: function(id) {
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-
-      var name = id.parts[0];
-      if (!name) {
-        // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
-        this.opcode('pushContext');
-      } else {
-        this.opcode('lookupOnContext', id.parts, id.falsy, id.isScoped);
-      }
-    },
-
-    DATA: function(data) {
-      this.options.data = true;
-      this.opcode('lookupData', data.id.depth, data.id.parts);
-    },
-
-    STRING: function(string) {
-      this.opcode('pushString', string.string);
-    },
-
-    NUMBER: function(number) {
-      this.opcode('pushLiteral', number.number);
-    },
-
-    BOOLEAN: function(bool) {
-      this.opcode('pushLiteral', bool.bool);
-    },
-
-    comment: function() {},
-
-    // HELPERS
-    opcode: function(name) {
-      this.opcodes.push({ opcode: name, args: slice.call(arguments, 1) });
-    },
-
-    addDepth: function(depth) {
-      if(depth === 0) { return; }
-
-      if(!this.depths[depth]) {
-        this.depths[depth] = true;
-        this.depths.list.push(depth);
-      }
-    },
-
-    classifySexpr: function(sexpr) {
-      var isHelper   = sexpr.isHelper;
-      var isEligible = sexpr.eligibleHelper;
-      var options    = this.options;
-
-      // if ambiguous, we can possibly resolve the ambiguity now
-      // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
-      if (isEligible && !isHelper) {
-        var name = sexpr.id.parts[0];
-
-        if (options.knownHelpers[name]) {
-          isHelper = true;
-        } else if (options.knownHelpersOnly) {
-          isEligible = false;
-        }
-      }
-
-      if (isHelper) { return "helper"; }
-      else if (isEligible) { return "ambiguous"; }
-      else { return "simple"; }
-    },
-
-    pushParams: function(params) {
-      for(var i=0, l=params.length; i<l; i++) {
-        this.pushParam(params[i]);
-      }
-    },
-
-    pushParam: function(val) {
-      if (this.stringParams) {
-        if(val.depth) {
-          this.addDepth(val.depth);
-        }
-        this.opcode('getContext', val.depth || 0);
-        this.opcode('pushStringParam', val.stringModeValue, val.type);
-
-        if (val.type === 'sexpr') {
-          // Subexpressions get evaluated and passed in
-          // in string params mode.
-          this.sexpr(val);
-        }
-      } else {
-        if (this.trackIds) {
-          this.opcode('pushId', val.type, val.idName || val.stringModeValue);
-        }
-        this.accept(val);
-      }
-    },
-
-    setupFullMustacheParams: function(sexpr, program, inverse) {
-      var params = sexpr.params;
-      this.pushParams(params);
-
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-
-      if (sexpr.hash) {
-        this.hash(sexpr.hash);
-      } else {
-        this.opcode('emptyHash');
-      }
-
-      return params;
-    }
-  };
-
-  function precompile(input, options, env) {
-    if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
-      throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
-    }
-
-    options = options || {};
-    if (!('data' in options)) {
-      options.data = true;
-    }
-    if (options.compat) {
-      options.useDepths = true;
-    }
-
-    var ast = env.parse(input);
-    var environment = new env.Compiler().compile(ast, options);
-    return new env.JavaScriptCompiler().compile(environment, options);
-  }
-
-  __exports__.precompile = precompile;function compile(input, options, env) {
-    if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
-      throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
-    }
-
-    options = options || {};
-
-    if (!('data' in options)) {
-      options.data = true;
-    }
-    if (options.compat) {
-      options.useDepths = true;
-    }
-
-    var compiled;
-
-    function compileInput() {
-      var ast = env.parse(input);
-      var environment = new env.Compiler().compile(ast, options);
-      var templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
-      return env.template(templateSpec);
-    }
-
-    // Template is only compiled on first use and cached after that point.
-    var ret = function(context, options) {
-      if (!compiled) {
-        compiled = compileInput();
-      }
-      return compiled.call(this, context, options);
-    };
-    ret._setup = function(options) {
-      if (!compiled) {
-        compiled = compileInput();
-      }
-      return compiled._setup(options);
-    };
-    ret._child = function(i, data, depths) {
-      if (!compiled) {
-        compiled = compileInput();
-      }
-      return compiled._child(i, data, depths);
-    };
-    return ret;
-  }
-
-  __exports__.compile = compile;function argEquals(a, b) {
-    if (a === b) {
-      return true;
-    }
-
-    if (isArray(a) && isArray(b) && a.length === b.length) {
-      for (var i = 0; i < a.length; i++) {
-        if (!argEquals(a[i], b[i])) {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-  return __exports__;
-})(__module5__, __module3__);
-
-// handlebars/compiler/javascript-compiler.js
-var __module12__ = (function(__dependency1__, __dependency2__) {
-  "use strict";
-  var __exports__;
-  var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
-  var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
-  var Exception = __dependency2__;
-
-  function Literal(value) {
-    this.value = value;
-  }
-
-  function JavaScriptCompiler() {}
-
-  JavaScriptCompiler.prototype = {
-    // PUBLIC API: You can override these methods in a subclass to provide
-    // alternative compiled forms for name lookup and buffering semantics
-    nameLookup: function(parent, name /* , type*/) {
-      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-        return parent + "." + name;
-      } else {
-        return parent + "['" + name + "']";
-      }
-    },
-    depthedLookup: function(name) {
-      this.aliases.lookup = 'this.lookup';
-
-      return 'lookup(depths, "' + name + '")';
-    },
-
-    compilerInfo: function() {
-      var revision = COMPILER_REVISION,
-          versions = REVISION_CHANGES[revision];
-      return [revision, versions];
-    },
-
-    appendToBuffer: function(string) {
-      if (this.environment.isSimple) {
-        return "return " + string + ";";
-      } else {
-        return {
-          appendToBuffer: true,
-          content: string,
-          toString: function() { return "buffer += " + string + ";"; }
-        };
-      }
-    },
-
-    initializeBuffer: function() {
-      return this.quotedString("");
-    },
-
-    namespace: "Handlebars",
-    // END PUBLIC API
-
-    compile: function(environment, options, context, asObject) {
-      this.environment = environment;
-      this.options = options;
-      this.stringParams = this.options.stringParams;
-      this.trackIds = this.options.trackIds;
-      this.precompile = !asObject;
-
-      this.name = this.environment.name;
-      this.isChild = !!context;
-      this.context = context || {
-        programs: [],
-        environments: []
-      };
-
-      this.preamble();
-
-      this.stackSlot = 0;
-      this.stackVars = [];
-      this.aliases = {};
-      this.registers = { list: [] };
-      this.hashes = [];
-      this.compileStack = [];
-      this.inlineStack = [];
-
-      this.compileChildren(environment, options);
-
-      this.useDepths = this.useDepths || environment.depths.list.length || this.options.compat;
-
-      var opcodes = environment.opcodes,
-          opcode,
-          i,
-          l;
-
-      for (i = 0, l = opcodes.length; i < l; i++) {
-        opcode = opcodes[i];
-
-        this[opcode.opcode].apply(this, opcode.args);
-      }
-
-      // Flush any trailing content that might be pending.
-      this.pushSource('');
-
-      /* istanbul ignore next */
-      if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
-        throw new Exception('Compile completed with content left on stack');
-      }
-
-      var fn = this.createFunctionContext(asObject);
-      if (!this.isChild) {
-        var ret = {
-          compiler: this.compilerInfo(),
-          main: fn
-        };
-        var programs = this.context.programs;
-        for (i = 0, l = programs.length; i < l; i++) {
-          if (programs[i]) {
-            ret[i] = programs[i];
-          }
-        }
-
-        if (this.environment.usePartial) {
-          ret.usePartial = true;
-        }
-        if (this.options.data) {
-          ret.useData = true;
-        }
-        if (this.useDepths) {
-          ret.useDepths = true;
-        }
-        if (this.options.compat) {
-          ret.compat = true;
-        }
-
-        if (!asObject) {
-          ret.compiler = JSON.stringify(ret.compiler);
-          ret = this.objectLiteral(ret);
-        }
-
-        return ret;
-      } else {
-        return fn;
-      }
-    },
-
-    preamble: function() {
-      // track the last context pushed into place to allow skipping the
-      // getContext opcode when it would be a noop
-      this.lastContext = 0;
-      this.source = [];
-    },
-
-    createFunctionContext: function(asObject) {
-      var varDeclarations = '';
-
-      var locals = this.stackVars.concat(this.registers.list);
-      if(locals.length > 0) {
-        varDeclarations += ", " + locals.join(", ");
-      }
-
-      // Generate minimizer alias mappings
-      for (var alias in this.aliases) {
-        if (this.aliases.hasOwnProperty(alias)) {
-          varDeclarations += ', ' + alias + '=' + this.aliases[alias];
-        }
-      }
-
-      var params = ["depth0", "helpers", "partials", "data"];
-
-      if (this.useDepths) {
-        params.push('depths');
-      }
-
-      // Perform a second pass over the output to merge content when possible
-      var source = this.mergeSource(varDeclarations);
-
-      if (asObject) {
-        params.push(source);
-
-        return Function.apply(this, params);
-      } else {
-        return 'function(' + params.join(',') + ') {\n  ' + source + '}';
-      }
-    },
-    mergeSource: function(varDeclarations) {
-      var source = '',
-          buffer,
-          appendOnly = !this.forceBuffer,
-          appendFirst;
-
-      for (var i = 0, len = this.source.length; i < len; i++) {
-        var line = this.source[i];
-        if (line.appendToBuffer) {
-          if (buffer) {
-            buffer = buffer + '\n    + ' + line.content;
-          } else {
-            buffer = line.content;
-          }
-        } else {
-          if (buffer) {
-            if (!source) {
-              appendFirst = true;
-              source = buffer + ';\n  ';
-            } else {
-              source += 'buffer += ' + buffer + ';\n  ';
-            }
-            buffer = undefined;
-          }
-          source += line + '\n  ';
-
-          if (!this.environment.isSimple) {
-            appendOnly = false;
-          }
-        }
-      }
-
-      if (appendOnly) {
-        if (buffer || !source) {
-          source += 'return ' + (buffer || '""') + ';\n';
-        }
-      } else {
-        varDeclarations += ", buffer = " + (appendFirst ? '' : this.initializeBuffer());
-        if (buffer) {
-          source += 'return buffer + ' + buffer + ';\n';
-        } else {
-          source += 'return buffer;\n';
-        }
-      }
-
-      if (varDeclarations) {
-        source = 'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n  ') + source;
-      }
-
-      return source;
-    },
-
-    // [blockValue]
-    //
-    // On stack, before: hash, inverse, program, value
-    // On stack, after: return value of blockHelperMissing
-    //
-    // The purpose of this opcode is to take a block of the form
-    // `{{#this.foo}}...{{/this.foo}}`, resolve the value of `foo`, and
-    // replace it on the stack with the result of properly
-    // invoking blockHelperMissing.
-    blockValue: function(name) {
-      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-      var params = [this.contextName(0)];
-      this.setupParams(name, 0, params);
-
-      var blockName = this.popStack();
-      params.splice(1, 0, blockName);
-
-      this.push('blockHelperMissing.call(' + params.join(', ') + ')');
-    },
-
-    // [ambiguousBlockValue]
-    //
-    // On stack, before: hash, inverse, program, value
-    // Compiler value, before: lastHelper=value of last found helper, if any
-    // On stack, after, if no lastHelper: same as [blockValue]
-    // On stack, after, if lastHelper: value
-    ambiguousBlockValue: function() {
-      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-      // We're being a bit cheeky and reusing the options value from the prior exec
-      var params = [this.contextName(0)];
-      this.setupParams('', 0, params, true);
-
-      this.flushInline();
-
-      var current = this.topStack();
-      params.splice(1, 0, current);
-
-      this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
-    },
-
-    // [appendContent]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    //
-    // Appends the string value of `content` to the current buffer
-    appendContent: function(content) {
-      if (this.pendingContent) {
-        content = this.pendingContent + content;
-      }
-
-      this.pendingContent = content;
-    },
-
-    // [append]
-    //
-    // On stack, before: value, ...
-    // On stack, after: ...
-    //
-    // Coerces `value` to a String and appends it to the current buffer.
-    //
-    // If `value` is truthy, or 0, it is coerced into a string and appended
-    // Otherwise, the empty string is appended
-    append: function() {
-      // Force anything that is inlined onto the stack so we don't have duplication
-      // when we examine local
-      this.flushInline();
-      var local = this.popStack();
-      this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }');
-      if (this.environment.isSimple) {
-        this.pushSource("else { " + this.appendToBuffer("''") + " }");
-      }
-    },
-
-    // [appendEscaped]
-    //
-    // On stack, before: value, ...
-    // On stack, after: ...
-    //
-    // Escape `value` and append it to the buffer
-    appendEscaped: function() {
-      this.aliases.escapeExpression = 'this.escapeExpression';
-
-      this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
-    },
-
-    // [getContext]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    // Compiler value, after: lastContext=depth
-    //
-    // Set the value of the `lastContext` compiler value to the depth
-    getContext: function(depth) {
-      this.lastContext = depth;
-    },
-
-    // [pushContext]
-    //
-    // On stack, before: ...
-    // On stack, after: currentContext, ...
-    //
-    // Pushes the value of the current context onto the stack.
-    pushContext: function() {
-      this.pushStackLiteral(this.contextName(this.lastContext));
-    },
-
-    // [lookupOnContext]
-    //
-    // On stack, before: ...
-    // On stack, after: currentContext[name], ...
-    //
-    // Looks up the value of `name` on the current context and pushes
-    // it onto the stack.
-    lookupOnContext: function(parts, falsy, scoped) {
-      /*jshint -W083 */
-      var i = 0,
-          len = parts.length;
-
-      if (!scoped && this.options.compat && !this.lastContext) {
-        // The depthed query is expected to handle the undefined logic for the root level that
-        // is implemented below, so we evaluate that directly in compat mode
-        this.push(this.depthedLookup(parts[i++]));
-      } else {
-        this.pushContext();
-      }
-
-      for (; i < len; i++) {
-        this.replaceStack(function(current) {
-          var lookup = this.nameLookup(current, parts[i], 'context');
-          // We want to ensure that zero and false are handled properly if the context (falsy flag)
-          // needs to have the special handling for these values.
-          if (!falsy) {
-            return ' != null ? ' + lookup + ' : ' + current;
-          } else {
-            // Otherwise we can use generic falsy handling
-            return ' && ' + lookup;
-          }
-        });
-      }
-    },
-
-    // [lookupData]
-    //
-    // On stack, before: ...
-    // On stack, after: data, ...
-    //
-    // Push the data lookup operator
-    lookupData: function(depth, parts) {
-      /*jshint -W083 */
-      if (!depth) {
-        this.pushStackLiteral('data');
-      } else {
-        this.pushStackLiteral('this.data(data, ' + depth + ')');
-      }
-
-      var len = parts.length;
-      for (var i = 0; i < len; i++) {
-        this.replaceStack(function(current) {
-          return ' && ' + this.nameLookup(current, parts[i], 'data');
-        });
-      }
-    },
-
-    // [resolvePossibleLambda]
-    //
-    // On stack, before: value, ...
-    // On stack, after: resolved value, ...
-    //
-    // If the `value` is a lambda, replace it on the stack by
-    // the return value of the lambda
-    resolvePossibleLambda: function() {
-      this.aliases.lambda = 'this.lambda';
-
-      this.push('lambda(' + this.popStack() + ', ' + this.contextName(0) + ')');
-    },
-
-    // [pushStringParam]
-    //
-    // On stack, before: ...
-    // On stack, after: string, currentContext, ...
-    //
-    // This opcode is designed for use in string mode, which
-    // provides the string value of a parameter along with its
-    // depth rather than resolving it immediately.
-    pushStringParam: function(string, type) {
-      this.pushContext();
-      this.pushString(type);
-
-      // If it's a subexpression, the string result
-      // will be pushed after this opcode.
-      if (type !== 'sexpr') {
-        if (typeof string === 'string') {
-          this.pushString(string);
-        } else {
-          this.pushStackLiteral(string);
-        }
-      }
-    },
-
-    emptyHash: function() {
-      this.pushStackLiteral('{}');
-
-      if (this.trackIds) {
-        this.push('{}'); // hashIds
-      }
-      if (this.stringParams) {
-        this.push('{}'); // hashContexts
-        this.push('{}'); // hashTypes
-      }
-    },
-    pushHash: function() {
-      if (this.hash) {
-        this.hashes.push(this.hash);
-      }
-      this.hash = {values: [], types: [], contexts: [], ids: []};
-    },
-    popHash: function() {
-      var hash = this.hash;
-      this.hash = this.hashes.pop();
-
-      if (this.trackIds) {
-        this.push('{' + hash.ids.join(',') + '}');
-      }
-      if (this.stringParams) {
-        this.push('{' + hash.contexts.join(',') + '}');
-        this.push('{' + hash.types.join(',') + '}');
-      }
-
-      this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
-    },
-
-    // [pushString]
-    //
-    // On stack, before: ...
-    // On stack, after: quotedString(string), ...
-    //
-    // Push a quoted version of `string` onto the stack
-    pushString: function(string) {
-      this.pushStackLiteral(this.quotedString(string));
-    },
-
-    // [push]
-    //
-    // On stack, before: ...
-    // On stack, after: expr, ...
-    //
-    // Push an expression onto the stack
-    push: function(expr) {
-      this.inlineStack.push(expr);
-      return expr;
-    },
-
-    // [pushLiteral]
-    //
-    // On stack, before: ...
-    // On stack, after: value, ...
-    //
-    // Pushes a value onto the stack. This operation prevents
-    // the compiler from creating a temporary variable to hold
-    // it.
-    pushLiteral: function(value) {
-      this.pushStackLiteral(value);
-    },
-
-    // [pushProgram]
-    //
-    // On stack, before: ...
-    // On stack, after: program(guid), ...
-    //
-    // Push a program expression onto the stack. This takes
-    // a compile-time guid and converts it into a runtime-accessible
-    // expression.
-    pushProgram: function(guid) {
-      if (guid != null) {
-        this.pushStackLiteral(this.programExpression(guid));
-      } else {
-        this.pushStackLiteral(null);
-      }
-    },
-
-    // [invokeHelper]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of helper invocation
-    //
-    // Pops off the helper's parameters, invokes the helper,
-    // and pushes the helper's return value onto the stack.
-    //
-    // If the helper is not found, `helperMissing` is called.
-    invokeHelper: function(paramSize, name, isSimple) {
-      this.aliases.helperMissing = 'helpers.helperMissing';
-
-      var nonHelper = this.popStack();
-      var helper = this.setupHelper(paramSize, name);
-
-      var lookup = (isSimple ? helper.name + ' || ' : '') + nonHelper + ' || helperMissing';
-      this.push('((' + lookup + ').call(' + helper.callParams + '))');
-    },
-
-    // [invokeKnownHelper]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of helper invocation
-    //
-    // This operation is used when the helper is known to exist,
-    // so a `helperMissing` fallback is not required.
-    invokeKnownHelper: function(paramSize, name) {
-      var helper = this.setupHelper(paramSize, name);
-      this.push(helper.name + ".call(" + helper.callParams + ")");
-    },
-
-    // [invokeAmbiguous]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of disambiguation
-    //
-    // This operation is used when an expression like `{{foo}}`
-    // is provided, but we don't know at compile-time whether it
-    // is a helper or a path.
-    //
-    // This operation emits more code than the other options,
-    // and can be avoided by passing the `knownHelpers` and
-    // `knownHelpersOnly` flags at compile-time.
-    invokeAmbiguous: function(name, helperCall) {
-      this.aliases.functionType = '"function"';
-      this.aliases.helperMissing = 'helpers.helperMissing';
-      this.useRegister('helper');
-
-      var nonHelper = this.popStack();
-
-      this.emptyHash();
-      var helper = this.setupHelper(0, name, helperCall);
-
-      var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-      this.push(
-        '((helper = (helper = ' + helperName + ' || ' + nonHelper + ') != null ? helper : helperMissing'
-          + (helper.paramsInit ? '),(' + helper.paramsInit : '') + '),'
-        + '(typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper))');
-    },
-
-    // [invokePartial]
-    //
-    // On stack, before: context, ...
-    // On stack after: result of partial invocation
-    //
-    // This operation pops off a context, invokes a partial with that context,
-    // and pushes the result of the invocation back.
-    invokePartial: function(name, indent) {
-      var params = [this.nameLookup('partials', name, 'partial'), "'" + indent + "'", "'" + name + "'", this.popStack(), this.popStack(), "helpers", "partials"];
-
-      if (this.options.data) {
-        params.push("data");
-      } else if (this.options.compat) {
-        params.push('undefined');
-      }
-      if (this.options.compat) {
-        params.push('depths');
-      }
-
-      this.push("this.invokePartial(" + params.join(", ") + ")");
-    },
-
-    // [assignToHash]
-    //
-    // On stack, before: value, ..., hash, ...
-    // On stack, after: ..., hash, ...
-    //
-    // Pops a value off the stack and assigns it to the current hash
-    assignToHash: function(key) {
-      var value = this.popStack(),
-          context,
-          type,
-          id;
-
-      if (this.trackIds) {
-        id = this.popStack();
-      }
-      if (this.stringParams) {
-        type = this.popStack();
-        context = this.popStack();
-      }
-
-      var hash = this.hash;
-      if (context) {
-        hash.contexts.push("'" + key + "': " + context);
-      }
-      if (type) {
-        hash.types.push("'" + key + "': " + type);
-      }
-      if (id) {
-        hash.ids.push("'" + key + "': " + id);
-      }
-      hash.values.push("'" + key + "': (" + value + ")");
-    },
-
-    pushId: function(type, name) {
-      if (type === 'ID' || type === 'DATA') {
-        this.pushString(name);
-      } else if (type === 'sexpr') {
-        this.pushStackLiteral('true');
-      } else {
-        this.pushStackLiteral('null');
-      }
-    },
-
-    // HELPERS
-
-    compiler: JavaScriptCompiler,
-
-    compileChildren: function(environment, options) {
-      var children = environment.children, child, compiler;
-
-      for(var i=0, l=children.length; i<l; i++) {
-        child = children[i];
-        compiler = new this.compiler();
-
-        var index = this.matchExistingProgram(child);
-
-        if (index == null) {
-          this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-          index = this.context.programs.length;
-          child.index = index;
-          child.name = 'program' + index;
-          this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
-          this.context.environments[index] = child;
-
-          this.useDepths = this.useDepths || compiler.useDepths;
-        } else {
-          child.index = index;
-          child.name = 'program' + index;
-        }
-      }
-    },
-    matchExistingProgram: function(child) {
-      for (var i = 0, len = this.context.environments.length; i < len; i++) {
-        var environment = this.context.environments[i];
-        if (environment && environment.equals(child)) {
-          return i;
-        }
-      }
-    },
-
-    programExpression: function(guid) {
-      var child = this.environment.children[guid],
-          depths = child.depths.list,
-          useDepths = this.useDepths,
-          depth;
-
-      var programParams = [child.index, 'data'];
-
-      if (useDepths) {
-        programParams.push('depths');
-      }
-
-      return 'this.program(' + programParams.join(', ') + ')';
-    },
-
-    useRegister: function(name) {
-      if(!this.registers[name]) {
-        this.registers[name] = true;
-        this.registers.list.push(name);
-      }
-    },
-
-    pushStackLiteral: function(item) {
-      return this.push(new Literal(item));
-    },
-
-    pushSource: function(source) {
-      if (this.pendingContent) {
-        this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent)));
-        this.pendingContent = undefined;
-      }
-
-      if (source) {
-        this.source.push(source);
-      }
-    },
-
-    pushStack: function(item) {
-      this.flushInline();
-
-      var stack = this.incrStack();
-      this.pushSource(stack + " = " + item + ";");
-      this.compileStack.push(stack);
-      return stack;
-    },
-
-    replaceStack: function(callback) {
-      var prefix = '',
-          inline = this.isInline(),
-          stack,
-          createdStack,
-          usedLiteral;
-
-      /* istanbul ignore next */
-      if (!this.isInline()) {
-        throw new Exception('replaceStack on non-inline');
-      }
-
-      // We want to merge the inline statement into the replacement statement via ','
-      var top = this.popStack(true);
-
-      if (top instanceof Literal) {
-        // Literals do not need to be inlined
-        prefix = stack = top.value;
-        usedLiteral = true;
-      } else {
-        // Get or create the current stack name for use by the inline
-        createdStack = !this.stackSlot;
-        var name = !createdStack ? this.topStackName() : this.incrStack();
-
-        prefix = '(' + this.push(name) + ' = ' + top + ')';
-        stack = this.topStack();
-      }
-
-      var item = callback.call(this, stack);
-
-      if (!usedLiteral) {
-        this.popStack();
-      }
-      if (createdStack) {
-        this.stackSlot--;
-      }
-      this.push('(' + prefix + item + ')');
-    },
-
-    incrStack: function() {
-      this.stackSlot++;
-      if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
-      return this.topStackName();
-    },
-    topStackName: function() {
-      return "stack" + this.stackSlot;
-    },
-    flushInline: function() {
-      var inlineStack = this.inlineStack;
-      if (inlineStack.length) {
-        this.inlineStack = [];
-        for (var i = 0, len = inlineStack.length; i < len; i++) {
-          var entry = inlineStack[i];
-          if (entry instanceof Literal) {
-            this.compileStack.push(entry);
-          } else {
-            this.pushStack(entry);
-          }
-        }
-      }
-    },
-    isInline: function() {
-      return this.inlineStack.length;
-    },
-
-    popStack: function(wrapped) {
-      var inline = this.isInline(),
-          item = (inline ? this.inlineStack : this.compileStack).pop();
-
-      if (!wrapped && (item instanceof Literal)) {
-        return item.value;
-      } else {
-        if (!inline) {
-          /* istanbul ignore next */
-          if (!this.stackSlot) {
-            throw new Exception('Invalid stack pop');
-          }
-          this.stackSlot--;
-        }
-        return item;
-      }
-    },
-
-    topStack: function() {
-      var stack = (this.isInline() ? this.inlineStack : this.compileStack),
-          item = stack[stack.length - 1];
-
-      if (item instanceof Literal) {
-        return item.value;
-      } else {
-        return item;
-      }
-    },
-
-    contextName: function(context) {
-      if (this.useDepths && context) {
-        return 'depths[' + context + ']';
-      } else {
-        return 'depth' + context;
-      }
-    },
-
-    quotedString: function(str) {
-      return '"' + str
-        .replace(/\\/g, '\\\\')
-        .replace(/"/g, '\\"')
-        .replace(/\n/g, '\\n')
-        .replace(/\r/g, '\\r')
-        .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\u2029/g, '\\u2029') + '"';
-    },
-
-    objectLiteral: function(obj) {
-      var pairs = [];
-
-      for (var key in obj) {
-        if (obj.hasOwnProperty(key)) {
-          pairs.push(this.quotedString(key) + ':' + obj[key]);
-        }
-      }
-
-      return '{' + pairs.join(',') + '}';
-    },
-
-    setupHelper: function(paramSize, name, blockHelper) {
-      var params = [],
-          paramsInit = this.setupParams(name, paramSize, params, blockHelper);
-      var foundHelper = this.nameLookup('helpers', name, 'helper');
-
-      return {
-        params: params,
-        paramsInit: paramsInit,
-        name: foundHelper,
-        callParams: [this.contextName(0)].concat(params).join(", ")
-      };
-    },
-
-    setupOptions: function(helper, paramSize, params) {
-      var options = {}, contexts = [], types = [], ids = [], param, inverse, program;
-
-      options.name = this.quotedString(helper);
-      options.hash = this.popStack();
-
-      if (this.trackIds) {
-        options.hashIds = this.popStack();
-      }
-      if (this.stringParams) {
-        options.hashTypes = this.popStack();
-        options.hashContexts = this.popStack();
-      }
-
-      inverse = this.popStack();
-      program = this.popStack();
-
-      // Avoid setting fn and inverse if neither are set. This allows
-      // helpers to do a check for `if (options.fn)`
-      if (program || inverse) {
-        if (!program) {
-          program = 'this.noop';
-        }
-
-        if (!inverse) {
-          inverse = 'this.noop';
-        }
-
-        options.fn = program;
-        options.inverse = inverse;
-      }
-
-      // The parameters go on to the stack in order (making sure that they are evaluated in order)
-      // so we need to pop them off the stack in reverse order
-      var i = paramSize;
-      while (i--) {
-        param = this.popStack();
-        params[i] = param;
-
-        if (this.trackIds) {
-          ids[i] = this.popStack();
-        }
-        if (this.stringParams) {
-          types[i] = this.popStack();
-          contexts[i] = this.popStack();
-        }
-      }
-
-      if (this.trackIds) {
-        options.ids = "[" + ids.join(",") + "]";
-      }
-      if (this.stringParams) {
-        options.types = "[" + types.join(",") + "]";
-        options.contexts = "[" + contexts.join(",") + "]";
-      }
-
-      if (this.options.data) {
-        options.data = "data";
-      }
-
-      return options;
-    },
-
-    // the params and contexts arguments are passed in arrays
-    // to fill in
-    setupParams: function(helperName, paramSize, params, useRegister) {
-      var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params));
-
-      if (useRegister) {
-        this.useRegister('options');
-        params.push('options');
-        return 'options=' + options;
-      } else {
-        params.push(options);
-        return '';
-      }
-    }
-  };
-
-  var reservedWords = (
-    "break else new var" +
-    " case finally return void" +
-    " catch for switch while" +
-    " continue function this with" +
-    " default if throw" +
-    " delete in try" +
-    " do instanceof typeof" +
-    " abstract enum int short" +
-    " boolean export interface static" +
-    " byte extends long super" +
-    " char final native synchronized" +
-    " class float package throws" +
-    " const goto private transient" +
-    " debugger implements protected volatile" +
-    " double import public let yield"
-  ).split(" ");
-
-  var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-  for(var i=0, l=reservedWords.length; i<l; i++) {
-    compilerWords[reservedWords[i]] = true;
-  }
-
-  JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-    return !JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name);
-  };
-
-  __exports__ = JavaScriptCompiler;
-  return __exports__;
-})(__module2__, __module5__);
-
-// handlebars.js
-var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
-  "use strict";
-  var __exports__;
-  /*globals Handlebars: true */
-  var Handlebars = __dependency1__;
-
-  // Compiler imports
-  var AST = __dependency2__;
-  var Parser = __dependency3__.parser;
-  var parse = __dependency3__.parse;
-  var Compiler = __dependency4__.Compiler;
-  var compile = __dependency4__.compile;
-  var precompile = __dependency4__.precompile;
-  var JavaScriptCompiler = __dependency5__;
-
-  var _create = Handlebars.create;
-  var create = function() {
-    var hb = _create();
-
-    hb.compile = function(input, options) {
-      return compile(input, options, hb);
-    };
-    hb.precompile = function (input, options) {
-      return precompile(input, options, hb);
-    };
-
-    hb.AST = AST;
-    hb.Compiler = Compiler;
-    hb.JavaScriptCompiler = JavaScriptCompiler;
-    hb.Parser = Parser;
-    hb.parse = parse;
-
-    return hb;
-  };
-
-  Handlebars = create();
-  Handlebars.create = create;
-
-  Handlebars['default'] = Handlebars;
-
-  __exports__ = Handlebars;
-  return __exports__;
-})(__module1__, __module7__, __module8__, __module11__, __module12__);
-
-  return __module0__;
-}));
diff --git a/kcov-38/data/js/jquery.min.js b/kcov-38/data/js/jquery.min.js
deleted file mode 100644
index e5ace116b6f5..000000000000
--- a/kcov-38/data/js/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
-},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
-},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Ic=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Jc})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Lc=a.jQuery,Mc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Mc),b&&a.jQuery===n&&(a.jQuery=Lc),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/kcov-38/data/js/jquery.tablesorter.min.js b/kcov-38/data/js/jquery.tablesorter.min.js
deleted file mode 100644
index 0c52bdc0ed9a..000000000000
--- a/kcov-38/data/js/jquery.tablesorter.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-* TableSorter 2.17.1 min - Client-side table sorting with ease!
-* Copyright (c) 2007 Christian Bach
-*/
-!(function(g){g.extend({tablesorter:new function(){function d(){var b=arguments[0],a=1<arguments.length?Array.prototype.slice.call(arguments):b;if("undefined"!==typeof console&&"undefined"!==typeof console.log)console[/error/i.test(b)?"error":/warn/i.test(b)?"warn":"log"](a);else alert(a)}function v(b,a){d(b+" ("+((new Date).getTime()-a.getTime())+"ms)")}function p(b){for(var a in b)return!1;return!0}function n(b,a,c){if(!a)return"";var h,e=b.config,r=e.textExtraction||"",k="",k="basic"===r?g(a).attr(e.textAttribute)|| a.textContent||a.innerText||g(a).text()||"":"function"===typeof r?r(a,b,c):"function"===typeof(h=f.getColumnData(b,r,c))?h(a,b,c):a.textContent||a.innerText||g(a).text()||"";return g.trim(k)}function t(b){var a=b.config,c=a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),h,e,r,k,l,m,g,u,p,q=0,s="",t=c.length;if(0===t)return a.debug?d("Warning: *Empty table!* Not building a parser cache"):"";a.debug&&(p=new Date,d("Detecting parsers for each column"));for(e=[];q<t;){h=c[q].rows;if(h[q])for(r= a.columns,k=0;k<r;k++){l=a.$headers.filter('[data-column="'+k+'"]:last');m=f.getColumnData(b,a.headers,k);u=f.getParserById(f.getData(l,m,"sorter"));g="false"===f.getData(l,m,"parser");a.empties[k]=f.getData(l,m,"empty")||a.emptyTo||(a.emptyToBottom?"bottom":"top");a.strings[k]=f.getData(l,m,"string")||a.stringTo||"max";g&&(u=f.getParserById("no-parser"));if(!u)a:{l=b;m=h;g=-1;u=k;for(var A=void 0,x=f.parsers.length,z=!1,F="",A=!0;""===F&&A;)g++,m[g]?(z=m[g].cells[u],F=n(l,z,u),l.config.debug&&d("Checking if value was empty on row "+ g+", column: "+u+': "'+F+'"')):A=!1;for(;0<=--x;)if((A=f.parsers[x])&&"text"!==A.id&&A.is&&A.is(F,l,z)){u=A;break a}u=f.getParserById("text")}a.debug&&(s+="column:"+k+"; parser:"+u.id+"; string:"+a.strings[k]+"; empty: "+a.empties[k]+"\n");e[k]=u}q+=e.length?t:1}a.debug&&(d(s?s:"No parsers detected"),v("Completed detecting parsers",p));a.parsers=e}function x(b){var a,c,h,e,r,k,l,m,y,u,p,q=b.config,s=q.$table.children("tbody"),t=q.parsers;q.cache={};if(!t)return q.debug?d("Warning: *Empty table!* Not building a cache"): "";q.debug&&(m=new Date);q.showProcessing&&f.isProcessing(b,!0);for(r=0;r<s.length;r++)if(p=[],a=q.cache[r]={normalized:[]},!s.eq(r).hasClass(q.cssInfoBlock)){y=s[r]&&s[r].rows.length||0;for(h=0;h<y;++h)if(u={child:[]},k=g(s[r].rows[h]),l=[],k.hasClass(q.cssChildRow)&&0!==h)c=a.normalized.length-1,a.normalized[c][q.columns].$row=a.normalized[c][q.columns].$row.add(k),k.prev().hasClass(q.cssChildRow)||k.prev().addClass(f.css.cssHasChild),u.child[c]=g.trim(k[0].textContent||k[0].innerText||k.text()|| "");else{u.$row=k;u.order=h;for(e=0;e<q.columns;++e)"undefined"===typeof t[e]?q.debug&&d("No parser found for cell:",k[0].cells[e],"does it have a header?"):(c=n(b,k[0].cells[e],e),c="no-parser"===t[e].id?"":t[e].format(c,b,k[0].cells[e],e),l.push(c),"numeric"===(t[e].type||"").toLowerCase()&&(p[e]=Math.max(Math.abs(c)||0,p[e]||0)));l[q.columns]=u;a.normalized.push(l)}a.colMax=p}q.showProcessing&&f.isProcessing(b);q.debug&&v("Building cache for "+y+" rows",m)}function z(b,a){var c=b.config,h=c.widgetOptions, e=b.tBodies,r=[],k=c.cache,d,m,y,u,n,q;if(p(k))return c.appender?c.appender(b,r):b.isUpdating?c.$table.trigger("updateComplete",b):"";c.debug&&(q=new Date);for(n=0;n<e.length;n++)if(d=g(e[n]),d.length&&!d.hasClass(c.cssInfoBlock)){y=f.processTbody(b,d,!0);d=k[n].normalized;m=d.length;for(u=0;u<m;u++)r.push(d[u][c.columns].$row),c.appender&&(!c.pager||c.pager.removeRows&&h.pager_removeRows||c.pager.ajax)||y.append(d[u][c.columns].$row);f.processTbody(b,y,!1)}c.appender&&c.appender(b,r);c.debug&&v("Rebuilt table", q);a||c.appender||f.applyWidget(b);b.isUpdating&&c.$table.trigger("updateComplete",b)}function C(b){return/^d/i.test(b)||1===b}function D(b){var a,c,h,e,r,k,l,m=b.config;m.headerList=[];m.headerContent=[];m.debug&&(l=new Date);m.columns=f.computeColumnIndex(m.$table.children("thead, tfoot").children("tr"));e=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers.each(function(d){c=g(this);a=f.getColumnData(b,m.headers,d,!0);m.headerContent[d]=g(this).html(); r=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,e);m.onRenderTemplate&&(h=m.onRenderTemplate.apply(c,[d,r]))&&"string"===typeof h&&(r=h);g(this).html('<div class="'+f.css.headerIn+'">'+r+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(c,[d]);this.column=parseInt(g(this).attr("data-column"),10);this.order=C(f.getData(c,a,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder=!1;k=f.getData(c,a,"lockedOrder")||!1;"undefined"!==typeof k&& !1!==k&&(this.order=this.lockedOrder=C(k)?[1,1,1]:[0,0,0]);c.addClass(f.css.header+" "+m.cssHeader);m.headerList[d]=this;c.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow).attr("role","row");m.tabIndex&&c.attr("tabindex",0)}).attr({scope:"col",role:"columnheader"});B(b);m.debug&&(v("Built headers:",l),d(m.$headers))}function E(b,a,c){var h=b.config;h.$table.find(h.selectorRemove).remove();t(b);x(b);H(h.$table,a,c)}function B(b){var a,c,h=b.config;h.$headers.each(function(e,r){c=g(r);a="false"=== f.getData(r,f.getColumnData(b,h.headers,e,!0),"sorter");r.sortDisabled=a;c[a?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+a);b.id&&(a?c.removeAttr("aria-controls"):c.attr("aria-controls",b.id))})}function G(b){var a,c,h=b.config,e=h.sortList,r=e.length,d=f.css.sortNone+" "+h.cssNone,l=[f.css.sortAsc+" "+h.cssAsc,f.css.sortDesc+" "+h.cssDesc],m=["ascending","descending"],y=g(b).find("tfoot tr").children().add(h.$extraHeaders).removeClass(l.join(" "));h.$headers.removeClass(l.join(" ")).addClass(d).attr("aria-sort", "none");for(a=0;a<r;a++)if(2!==e[a][1]&&(b=h.$headers.not(".sorter-false").filter('[data-column="'+e[a][0]+'"]'+(1===r?":last":"")),b.length)){for(c=0;c<b.length;c++)b[c].sortDisabled||b.eq(c).removeClass(d).addClass(l[e[a][1]]).attr("aria-sort",m[e[a][1]]);y.length&&y.filter('[data-column="'+e[a][0]+'"]').removeClass(d).addClass(l[e[a][1]])}h.$headers.not(".sorter-false").each(function(){var b=g(this),a=this.order[(this.count+1)%(h.sortReset?3:2)],a=b.text()+": "+f.language[b.hasClass(f.css.sortAsc)? "sortAsc":b.hasClass(f.css.sortDesc)?"sortDesc":"sortNone"]+f.language[0===a?"nextAsc":1===a?"nextDesc":"nextNone"];b.attr("aria-label",a)})}function L(b){if(b.config.widthFixed&&0===g(b).find("colgroup").length){var a=g("<colgroup>"),c=g(b).width();g(b.tBodies[0]).find("tr:first").children("td:visible").each(function(){a.append(g("<col>").css("width",parseInt(g(this).width()/c*1E3,10)/10+"%"))});g(b).prepend(a)}}function M(b,a){var c,h,e,f,d,l=b.config,m=a||l.sortList;l.sortList=[];g.each(m,function(b, a){f=parseInt(a[0],10);if(e=l.$headers.filter('[data-column="'+f+'"]:last')[0]){h=(h=(""+a[1]).match(/^(1|d|s|o|n)/))?h[0]:"";switch(h){case "1":case "d":h=1;break;case "s":h=d||0;break;case "o":c=e.order[(d||0)%(l.sortReset?3:2)];h=0===c?1:1===c?0:2;break;case "n":e.count+=1;h=e.order[e.count%(l.sortReset?3:2)];break;default:h=0}d=0===b?h:d;c=[f,parseInt(h,10)||0];l.sortList.push(c);h=g.inArray(c[1],e.order);e.count=0<=h?h:c[1]%(l.sortReset?3:2)}})}function N(b,a){return b&&b[a]?b[a].type||"":""} function O(b,a,c){var h,e,d,k=b.config,l=!c[k.sortMultiSortKey],m=k.$table;m.trigger("sortStart",b);a.count=c[k.sortResetKey]?2:(a.count+1)%(k.sortReset?3:2);k.sortRestart&&(e=a,k.$headers.each(function(){this===e||!l&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=a.column;if(l){k.sortList=[];if(null!==k.sortForce)for(h=k.sortForce,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);h=a.order[a.count];if(2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+ c,h])}else{if(k.sortAppend&&1<k.sortList.length)for(c=0;c<k.sortAppend.length;c++)d=f.isValueInArray(k.sortAppend[c][0],k.sortList),0<=d&&k.sortList.splice(d,1);if(0<=f.isValueInArray(e,k.sortList))for(c=0;c<k.sortList.length;c++)d=k.sortList[c],h=k.$headers.filter('[data-column="'+d[0]+'"]:last')[0],d[0]===e&&(d[1]=h.order[a.count],2===d[1]&&(k.sortList.splice(c,1),h.count=-1));else if(h=a.order[a.count],2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+c,h])}if(null!== k.sortAppend)for(h=k.sortAppend,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);m.trigger("sortBegin",b);setTimeout(function(){G(b);I(b);z(b);m.trigger("sortEnd",b)},1)}function I(b){var a,c,h,e,d,k,g,m,y,n,t,q=0,s=b.config,w=s.textSorter||"",x=s.sortList,z=x.length,B=b.tBodies.length;if(!s.serverSideSorting&&!p(s.cache)){s.debug&&(d=new Date);for(c=0;c<B;c++)k=s.cache[c].colMax,g=s.cache[c].normalized,g.sort(function(c,d){for(a=0;a<z;a++){e=x[a][0];m=x[a][1];q=0===m;if(s.sortStable&&c[e]=== d[e]&&1===z)break;(h=/n/i.test(N(s.parsers,e)))&&s.strings[e]?(h="boolean"===typeof s.string[s.strings[e]]?(q?1:-1)*(s.string[s.strings[e]]?-1:1):s.strings[e]?s.string[s.strings[e]]||0:0,y=s.numberSorter?s.numberSorter(c[e],d[e],q,k[e],b):f["sortNumeric"+(q?"Asc":"Desc")](c[e],d[e],h,k[e],e,b)):(n=q?c:d,t=q?d:c,y="function"===typeof w?w(n[e],t[e],q,e,b):"object"===typeof w&&w.hasOwnProperty(e)?w[e](n[e],t[e],q,e,b):f["sortNatural"+(q?"Asc":"Desc")](c[e],d[e],e,b,s));if(y)return y}return c[s.columns].order- d[s.columns].order});s.debug&&v("Sorting on "+x.toString()+" and dir "+m+" time",d)}}function J(b,a){b[0].isUpdating&&b.trigger("updateComplete");g.isFunction(a)&&a(b[0])}function H(b,a,c){var h=b[0].config.sortList;!1!==a&&!b[0].isProcessing&&h.length?b.trigger("sorton",[h,function(){J(b,c)},!0]):(J(b,c),f.applyWidget(b[0],!1))}function K(b){var a=b.config,c=a.$table;c.unbind("sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(a.namespace+ " ")).bind("sortReset"+a.namespace,function(c,e){c.stopPropagation();a.sortList=[];G(b);I(b);z(b);g.isFunction(e)&&e(b)}).bind("updateAll"+a.namespace,function(c,e,d){c.stopPropagation();b.isUpdating=!0;f.refreshWidgets(b,!0,!0);f.restoreHeaders(b);D(b);f.bindEvents(b,a.$headers,!0);K(b);E(b,e,d)}).bind("update"+a.namespace+" updateRows"+a.namespace,function(a,c,d){a.stopPropagation();b.isUpdating=!0;B(b);E(b,c,d)}).bind("updateCell"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating= !0;c.find(a.selectorRemove).remove();var l,m;l=c.find("tbody");m=g(e);h=l.index(g.fn.closest?m.closest("tbody"):m.parents("tbody").filter(":first"));var p=g.fn.closest?m.closest("tr"):m.parents("tr").filter(":first");e=m[0];l.length&&0<=h&&(l=l.eq(h).find("tr").index(p),m=m.index(),a.cache[h].normalized[l][a.columns].$row=p,e=a.cache[h].normalized[l][m]="no-parser"===a.parsers[m].id?"":a.parsers[m].format(n(b,e,m),b,e,m),"numeric"===(a.parsers[m].type||"").toLowerCase()&&(a.cache[h].colMax[m]=Math.max(Math.abs(e)|| 0,a.cache[h].colMax[m]||0)),H(c,d,f))}).bind("addRows"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating=!0;if(p(a.cache))B(b),E(b,d,f);else{e=g(e);var l,m,v,u,x=e.filter("tr").length,q=c.find("tbody").index(e.parents("tbody").filter(":first"));a.parsers&&a.parsers.length||t(b);for(h=0;h<x;h++){m=e[h].cells.length;u=[];v={child:[],$row:e.eq(h),order:a.cache[q].normalized.length};for(l=0;l<m;l++)u[l]="no-parser"===a.parsers[l].id?"":a.parsers[l].format(n(b,e[h].cells[l],l),b,e[h].cells[l], l),"numeric"===(a.parsers[l].type||"").toLowerCase()&&(a.cache[q].colMax[l]=Math.max(Math.abs(u[l])||0,a.cache[q].colMax[l]||0));u.push(v);a.cache[q].normalized.push(u)}H(c,d,f)}}).bind("updateComplete"+a.namespace,function(){b.isUpdating=!1}).bind("sorton"+a.namespace,function(a,e,d,k){var l=b.config;a.stopPropagation();c.trigger("sortStart",this);M(b,e);G(b);l.delayInit&&p(l.cache)&&x(b);c.trigger("sortBegin",this);I(b);z(b,k);c.trigger("sortEnd",this);f.applyWidget(b);g.isFunction(d)&&d(b)}).bind("appendCache"+ a.namespace,function(a,c,d){a.stopPropagation();z(b,d);g.isFunction(c)&&c(b)}).bind("updateCache"+a.namespace,function(c,e){a.parsers&&a.parsers.length||t(b);x(b);g.isFunction(e)&&e(b)}).bind("applyWidgetId"+a.namespace,function(c,e){c.stopPropagation();f.getWidgetById(e).format(b,a,a.widgetOptions)}).bind("applyWidgets"+a.namespace,function(a,c){a.stopPropagation();f.applyWidget(b,c)}).bind("refreshWidgets"+a.namespace,function(a,c,d){a.stopPropagation();f.refreshWidgets(b,c,d)}).bind("destroy"+ a.namespace,function(a,c,d){a.stopPropagation();f.destroy(b,c,d)}).bind("resetToLoadState"+a.namespace,function(){f.refreshWidgets(b,!0,!0);a=g.extend(!0,f.defaults,a.originalSettings);b.hasInitialized=!1;f.setup(b,a)})}var f=this;f.version="2.17.1";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey", usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow", cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc", sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"};f.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"};f.log=d;f.benchmark=v;f.construct=function(b){return this.each(function(){var a=g.extend(!0,{},f.defaults,b);a.originalSettings=b;!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName? f.buildTable(this,a):f.setup(this,a)})};f.setup=function(b,a){if(!b||!b.tHead||0===b.tBodies.length||!0===b.hasInitialized)return a.debug?d("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var c="",h=g(b),e=g.metadata;b.hasInitialized=!1;b.isProcessing=!0;b.config=a;g.data(b,"tablesorter",a);a.debug&&g.data(b,"startoveralltimer",new Date);a.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(g.fn.jquery.split(".")); a.string={max:1,min:-1,emptyMin:1,emptyMax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(c=""!==a.theme?" tablesorter-"+a.theme:"");a.$table=h.addClass(f.css.table+" "+a.tableClass+c).attr({role:"grid"});a.$headers=g(b).find(a.selectorHeaders);a.namespace=a.namespace?"."+a.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2);a.$tbodies=h.children("tbody:not(."+a.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"});a.$table.find("caption").length&& a.$table.attr("aria-labelledby","theCaption");a.widgetInit={};a.textExtraction=a.$table.attr("data-text-extraction")||a.textExtraction||"basic";D(b);L(b);t(b);a.delayInit||x(b);f.bindEvents(b,a.$headers,!0);K(b);a.supportsDataObject&&"undefined"!==typeof h.data().sortlist?a.sortList=h.data().sortlist:e&&h.metadata()&&h.metadata().sortlist&&(a.sortList=h.metadata().sortlist);f.applyWidget(b,!0);0<a.sortList.length?h.trigger("sorton",[a.sortList,{},!a.initWidgets,!0]):(G(b),a.initWidgets&&f.applyWidget(b, !1));a.showProcessing&&h.unbind("sortBegin"+a.namespace+" sortEnd"+a.namespace).bind("sortBegin"+a.namespace+" sortEnd"+a.namespace,function(c){clearTimeout(a.processTimer);f.isProcessing(b);"sortBegin"===c.type&&(a.processTimer=setTimeout(function(){f.isProcessing(b,!0)},500))});b.hasInitialized=!0;b.isProcessing=!1;a.debug&&f.benchmark("Overall initialization time",g.data(b,"startoveralltimer"));h.trigger("tablesorter-initialized",b);"function"===typeof a.initialized&&a.initialized(b)};f.getColumnData= function(b,a,c,h){if("undefined"!==typeof a&&null!==a){b=g(b)[0];var e,d=b.config;if(a[c])return h?a[c]:a[d.$headers.index(d.$headers.filter('[data-column="'+c+'"]:last'))];for(e in a)if("string"===typeof e&&(b=h?d.$headers.eq(c).filter(e):d.$headers.filter('[data-column="'+c+'"]:last').filter(e),b.length))return a[e]}};f.computeColumnIndex=function(b){var a=[],c=0,h,e,d,f,l,m,p,v,n,q;for(h=0;h<b.length;h++)for(l=b[h].cells,e=0;e<l.length;e++){d=l[e];f=g(d);m=d.parentNode.rowIndex;f.index();p=d.rowSpan|| 1;v=d.colSpan||1;"undefined"===typeof a[m]&&(a[m]=[]);for(d=0;d<a[m].length+1;d++)if("undefined"===typeof a[m][d]){n=d;break}c=Math.max(n,c);f.attr({"data-column":n});for(d=m;d<m+p;d++)for("undefined"===typeof a[d]&&(a[d]=[]),q=a[d],f=n;f<n+v;f++)q[f]="x"}return c+1};f.isProcessing=function(b,a,c){b=g(b);var d=b[0].config;b=c||b.find("."+f.css.header);a?("undefined"!==typeof c&&0<d.sortList.length&&(b=b.filter(function(){return this.sortDisabled?!1:0<=f.isValueInArray(parseFloat(g(this).attr("data-column")), d.sortList)})),b.addClass(f.css.processing+" "+d.cssProcessing)):b.removeClass(f.css.processing+" "+d.cssProcessing)};f.processTbody=function(b,a,c){b=g(b)[0];if(c)return b.isProcessing=!0,a.before('<span class="tablesorter-savemyplace"/>'),c=g.fn.detach?a.detach():a.remove();c=g(b).find("span.tablesorter-savemyplace");a.insertAfter(c);c.remove();b.isProcessing=!1};f.clearTableBody=function(b){g(b)[0].config.$tbodies.detach()};f.bindEvents=function(b,a,c){b=g(b)[0];var d,e=b.config;!0!==c&&(e.$extraHeaders= e.$extraHeaders?e.$extraHeaders.add(a):a);a.find(e.selectorSort).add(a.filter(e.selectorSort)).unbind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" ")).bind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" "),function(c,f){var l;l=c.type;if(!(1!==(c.which||c.button)&&!/sort|keyup/.test(l)||"keyup"===l&&13!==c.which||"mouseup"===l&&!0!==f&&250<(new Date).getTime()-d)){if("mousedown"===l)return d=(new Date).getTime(),/(input|select|button|textarea)/i.test(c.target.tagName)? "":!e.cancelSelection;e.delayInit&&p(e.cache)&&x(b);l=g.fn.closest?g(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:g(this).parents("th, td")[0];l=e.$headers[a.index(l)];l.sortDisabled||O(b,l,c)}});e.cancelSelection&&a.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})};f.restoreHeaders=function(b){var a=g(b)[0].config;a.$table.find(a.selectorHeaders).each(function(b){g(this).find("."+f.css.headerIn).length&&g(this).html(a.headerContent[b])})}; f.destroy=function(b,a,c){b=g(b)[0];if(b.hasInitialized){f.refreshWidgets(b,!0,!0);var d=g(b),e=b.config,r=d.find("thead:first"),k=r.find("tr."+f.css.headerRow).removeClass(f.css.headerRow+" "+e.cssHeaderRow),l=d.find("tfoot:first > tr").children("th, td");!1===a&&0<=g.inArray("uitheme",e.widgets)&&(d.trigger("applyWidgetId",["uitheme"]),d.trigger("applyWidgetId",["zebra"]));r.find("tr").not(k).remove();d.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(e.namespace+ " "));e.$headers.add(l).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc,f.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true");k.find(e.selectorSort).unbind(["mousedown","mouseup","keypress",""].join(e.namespace+" "));f.restoreHeaders(b);d.toggleClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme,!1===a);b.hasInitialized=!1;delete b.config.cache;"function"===typeof c&&c(b)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(b,a){if(b===a)return 0;var c,d,e,g,k,l;d=f.regex;if(d.hex.test(a)){c=parseInt(b.match(d.hex),16);e=parseInt(a.match(d.hex),16);if(c<e)return-1;if(c>e)return 1}c=b.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");d=a.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");l=Math.max(c.length,d.length);for(k=0;k<l;k++){e=isNaN(c[k])?c[k]||0:parseFloat(c[k])||0;g=isNaN(d[k])?d[k]||0:parseFloat(d[k])||0;if(isNaN(e)!== isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:-c||-1:""===a&&0!==c?"boolean"===typeof c?c?1:-1:c||1:f.sortNatural(b,a)};f.sortNaturalDesc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:c||1:""===a&&0!==c?"boolean"===typeof c?c? 1:-1:-c||-1:f.sortNatural(a,b)};f.sortText=function(b,a){return b>a?1:b<a?-1:0};f.getTextValue=function(b,a,c){if(c){var d=b?b.length:0,e=c+a;for(c=0;c<d;c++)e+=b.charCodeAt(c);return a*e}return 0};f.sortNumericAsc=function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return b-a};f.sortNumericDesc= function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return a-b};f.sortNumeric=function(b,a){return b-a};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119", E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var a,c="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(a in d)"string"===typeof a&&(c+=d[a],f.characterRegexArray[a]=new RegExp("["+d[a]+"]","g"));f.characterRegex= new RegExp(c+"]")}if(f.characterRegex.test(b))for(a in d)"string"===typeof a&&(b=b.replace(f.characterRegexArray[a],a));return b};f.isValueInArray=function(b,a){var c,d=a.length;for(c=0;c<d;c++)if(a[c][0]===b)return c;return-1};f.addParser=function(b){var a,c=f.parsers.length,d=!0;for(a=0;a<c;a++)f.parsers[a].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){if("false"==b)return!1;var a,c=f.parsers.length;for(a=0;a<c;a++)if(f.parsers[a].id.toLowerCase()=== b.toString().toLowerCase())return f.parsers[a];return!1};f.addWidget=function(b){f.widgets.push(b)};f.getWidgetById=function(b){var a,c,d=f.widgets.length;for(a=0;a<d;a++)if((c=f.widgets[a])&&c.hasOwnProperty("id")&&c.id.toLowerCase()===b.toLowerCase())return c};f.applyWidget=function(b,a){b=g(b)[0];var c=b.config,d=c.widgetOptions,e=[],p,k,l;!1!==a&&b.hasInitialized&&(b.isApplyingWidgets||b.isUpdating)||(c.debug&&(p=new Date),c.widgets.length&&(b.isApplyingWidgets=!0,c.widgets=g.grep(c.widgets,function(a, b){return g.inArray(a,c.widgets)===b}),g.each(c.widgets||[],function(a,b){(l=f.getWidgetById(b))&&l.id&&(l.priority||(l.priority=10),e[a]=l)}),e.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(a||!c.widgetInit[f.id])f.hasOwnProperty("options")&&(d=b.config.widgetOptions=g.extend(!0,{},f.options,d)),f.hasOwnProperty("init")&&f.init(b,f,c,d),c.widgetInit[f.id]=!0;!a&&f.hasOwnProperty("format")&&f.format(b,c,d,!1)}})),setTimeout(function(){b.isApplyingWidgets= !1},0),c.debug&&(k=c.widgets.length,v("Completed "+(!0===a?"initializing ":"applying ")+k+" widget"+(1!==k?"s":""),p)))};f.refreshWidgets=function(b,a,c){b=g(b)[0];var h,e=b.config,p=e.widgets,k=f.widgets,l=k.length;for(h=0;h<l;h++)k[h]&&k[h].id&&(a||0>g.inArray(k[h].id,p))&&(e.debug&&d('Refeshing widgets: Removing "'+k[h].id+'"'),k[h].hasOwnProperty("remove")&&e.widgetInit[k[h].id]&&(k[h].remove(b,e,e.widgetOptions),e.widgetInit[k[h].id]=!1));!0!==c&&f.applyWidget(b,a)};f.getData=function(b,a,c){var d= "";b=g(b);var e,f;if(!b.length)return"";e=g.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(c)||"undefined"!==typeof b.data(c.toLowerCase())?d+=b.data(c)||b.data(c.toLowerCase()):e&&"undefined"!==typeof e[c]?d+=e[c]:a&&"undefined"!==typeof a[c]?d+=a[c]:" "!==f&&f.match(" "+c+"-")&&(d=f.match(new RegExp("\\s"+c+"-([\\w-]+)"))[1]||"");return g.trim(d)};f.formatFloat=function(b,a){if("string"!==typeof b||""===b)return b;var c;b=(a&&a.config?!1!==a.config.usNumberFormat: "undefined"!==typeof a?a:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(b);return isNaN(c)?g.trim(b):c};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,"")):!0}}});var n=g.tablesorter;g.fn.extend({tablesorter:n.construct});n.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"});n.addParser({id:"text",is:function(){return!0}, format:function(d,v){var p=v.config;d&&(d=g.trim(p.ignoreCase?d.toLocaleLowerCase():d),d=p.sortLocaleCompare?n.replaceAccents(d):d);return d},type:"text"});n.addParser({id:"digit",is:function(d){return n.isDigit(d)},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"currency",is:function(d){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((d|| "").replace(/[+\-,. ]/g,""))},format:function(d,v){var p=n.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),v);return d&&"number"===typeof p?p:d?g.trim(d&&v.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});n.addParser({id:"ipAddress",is:function(d){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(d)},format:function(d,g){var p,w=d?d.split("."):"",t="",x=w.length;for(p=0;p<x;p++)t+=("00"+w[p]).slice(-3);return d?n.formatFloat(t,g):d},type:"numeric"});n.addParser({id:"url",is:function(d){return/^(https?|ftp|file):\/\//.test(d)}, format:function(d){return d?g.trim(d.replace(/(https?|ftp|file):\/\//,"")):d},type:"text"});n.addParser({id:"isoDate",is:function(d){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(d)},format:function(d,g){return d?n.formatFloat(""!==d?(new Date(d.replace(/-/g,"/"))).getTime()||d:"",g):d},type:"numeric"});n.addParser({id:"percent",is:function(d){return/(\d\s*?%|%\s*?\d)/.test(d)&&15>d.length},format:function(d,g){return d?n.formatFloat(d.replace(/%/g,""),g):d},type:"numeric"});n.addParser({id:"usLongDate", is:function(d){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(d)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date(d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"shortDate",is:function(d){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((d||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(d,g,p,w){if(d){p=g.config; var t=p.$headers.filter("[data-column="+w+"]:last");w=t.length&&t[0].dateFormat||n.getData(t,n.getColumnData(g,p.headers,w),"dateFormat")||p.dateFormat;d=d.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===w?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===w&&(d=d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return d?n.formatFloat((new Date(d)).getTime()||d,g):d},type:"numeric"}); n.addParser({id:"time",is:function(d){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(d)},format:function(d,g){return d?n.formatFloat((new Date("2000/01/01 "+d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});n.addParser({id:"metadata",is:function(){return!1},format:function(d,n,p){d=n.config;d=d.parserMetadataName?d.parserMetadataName:"sortValue";return g(p).metadata()[d]},type:"numeric"});n.addWidget({id:"zebra",priority:90,format:function(d,v,p){var w,t, x,z,C,D,E=new RegExp(v.cssChildRow,"i"),B=v.$tbodies;v.debug&&(C=new Date);for(d=0;d<B.length;d++)w=B.eq(d),D=w.children("tr").length,1<D&&(x=0,w=w.children("tr:visible").not(v.selectorRemove),w.each(function(){t=g(this);E.test(this.className)||x++;z=0===x%2;t.removeClass(p.zebra[z?1:0]).addClass(p.zebra[z?0:1])}));v.debug&&n.benchmark("Applying Zebra widget",C)},remove:function(d,n,p){var w;n=n.$tbodies;var t=(p.zebra||["even","odd"]).join(" ");for(p=0;p<n.length;p++)w=g.tablesorter.processTbody(d, n.eq(p),!0),w.children().removeClass(t),g.tablesorter.processTbody(d,w,!1)}})})(jQuery);
diff --git a/kcov-38/data/js/jquery.tablesorter.widgets.min.js b/kcov-38/data/js/jquery.tablesorter.widgets.min.js
deleted file mode 100644
index 44fe73be994f..000000000000
--- a/kcov-38/data/js/jquery.tablesorter.widgets.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*! tableSorter 2.16+ widgets - updated 5/28/2014 (v2.17.1) */
-;(function(k){
-var c=k.tablesorter=k.tablesorter||{};
-c.themes={bootstrap:{table:"table table-bordered table-striped",caption:"caption",header:"bootstrap-header",footerRow:"",footerCells:"",icons:"",sortNone:"bootstrap-icon-unsorted",sortAsc:"icon-chevron-up glyphicon glyphicon-chevron-up",sortDesc:"icon-chevron-down glyphicon glyphicon-chevron-down",active:"",hover:"",filterRow:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all",caption:"ui-widget-content ui-corner-all",header:"ui-widget-header ui-corner-all ui-state-default", footerRow:"",footerCells:"",icons:"ui-icon",sortNone:"ui-icon-carat-2-n-s",sortAsc:"ui-icon-carat-1-n",sortDesc:"ui-icon-carat-1-s",active:"ui-state-active",hover:"ui-state-hover",filterRow:"",even:"ui-widget-content",odd:"ui-state-default"}};k.extend(c.css,{filterRow:"tablesorter-filter-row",filter:"tablesorter-filter",wrapper:"tablesorter-wrapper",resizer:"tablesorter-resizer",grip:"tablesorter-resizer-grip",sticky:"tablesorter-stickyHeader",stickyVis:"tablesorter-sticky-visible"});
-c.storage=function(b,a,c,d){b=k(b)[0];var f,g,h=!1;f={};g=b.config;var l=k(b);b=d&&d.id||l.attr(d&&d.group||"data-table-group")||b.id||k(".tablesorter").index(l);d=d&&d.url||l.attr(d&&d.page||"data-table-page")||g&&g.fixedUrl||window.location.pathname;if("localStorage"in window)try{window.localStorage.setItem("_tmptest","temp"),h=!0,window.localStorage.removeItem("_tmptest")}catch(n){}k.parseJSON&&(h?f=k.parseJSON(localStorage[a]||"{}"):(g=document.cookie.split(/[;\s|=]/),f=k.inArray(a,g)+1,f=0!==f?k.parseJSON(g[f]|| "{}"):{}));if((c||""===c)&&window.JSON&&JSON.hasOwnProperty("stringify"))f[d]||(f[d]={}),f[d][b]=c,h?localStorage[a]=JSON.stringify(f):(c=new Date,c.setTime(c.getTime()+31536E6),document.cookie=a+"="+JSON.stringify(f).replace(/\"/g,'"')+"; expires="+c.toGMTString()+"; path=/");else return f&&f[d]?f[d][b]:""};
-c.addHeaderResizeEvent=function(b,a,c){var d;c=k.extend({},{timer:250},c);var f=b.config,g=f.widgetOptions,h=function(a){g.resize_flag=!0;d=[];f.$headers.each(function(){var a=k(this),b=a.data("savedSizes")|| [0,0],c=this.offsetWidth,e=this.offsetHeight;if(c!==b[0]||e!==b[1])a.data("savedSizes",[c,e]),d.push(this)});d.length&&!1!==a&&f.$table.trigger("resize",[d]);g.resize_flag=!1};h(!1);clearInterval(g.resize_timer);if(a)return g.resize_flag=!1;g.resize_timer=setInterval(function(){g.resize_flag||h()},c.timer)};
-c.addWidget({id:"uitheme",priority:10,format:function(b,a,e){var d,f,g,h=c.themes;d=a.$table;g=a.$headers;var l=a.theme||"jui",n=h[l]||h.jui,h=n.sortNone+" "+n.sortDesc+" "+n.sortAsc;a.debug&& (f=new Date);d.hasClass("tablesorter-"+l)&&a.theme!==l&&b.hasInitialized||(""!==n.even&&(e.zebra[0]+=" "+n.even),""!==n.odd&&(e.zebra[1]+=" "+n.odd),d.find("caption").addClass(n.caption),b=d.removeClass(""===a.theme?"":"tablesorter-"+a.theme).addClass("tablesorter-"+l+" "+n.table).find("tfoot"),b.length&&b.find("tr").addClass(n.footerRow).children("th, td").addClass(n.footerCells),g.addClass(n.header).not(".sorter-false").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(a){k(this)["mouseenter"=== a.type?"addClass":"removeClass"](n.hover)}),g.find("."+c.css.wrapper).length||g.wrapInner('<div class="'+c.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>'),a.cssIcon&&g.find("."+c.css.icon).addClass(n.icons),d.hasClass("hasFilters")&&g.find("."+c.css.filterRow).addClass(n.filterRow));for(d=0;d<a.columns;d++)b=a.$headers.add(a.$extraHeaders).filter('[data-column="'+d+'"]'),e=c.css.icon?b.find("."+c.css.icon):b,a.$headers.filter('[data-column="'+d+'"]:last')[0].sortDisabled? (b.removeClass(h),e.removeClass(h+" "+n.icons)):(g=b.hasClass(c.css.sortAsc)?n.sortAsc:b.hasClass(c.css.sortDesc)?n.sortDesc:b.hasClass(c.css.header)?n.sortNone:"",b[g===n.sortNone?"removeClass":"addClass"](n.active),e.removeClass(h).addClass(g));a.debug&&c.benchmark("Applying "+l+" theme",f)},remove:function(b,a,e){b=a.$table;a=a.theme||"jui";e=c.themes[a]||c.themes.jui;var d=b.children("thead").children(),f=e.sortNone+" "+e.sortDesc+" "+e.sortAsc;b.removeClass("tablesorter-"+a+" "+e.table).find(c.css.header).removeClass(e.header); d.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(e.hover+" "+f+" "+e.active).find("."+c.css.filterRow).removeClass(e.filterRow);d.find("."+c.css.icon).removeClass(e.icons)}});
-c.addWidget({id:"columns",priority:30,options:{columns:["primary","secondary","tertiary"]},format:function(b,a,e){var d,f,g,h,l,n,p,m,s=a.$table,r=a.$tbodies,t=a.sortList,x=t.length,v=e&&e.columns||["primary","secondary","tertiary"],w=v.length-1;p=v.join(" ");a.debug&&(d=new Date);for(g=0;g<r.length;g++)f=c.processTbody(b, r.eq(g),!0),h=f.children("tr"),h.each(function(){l=k(this);if("none"!==this.style.display&&(n=l.children().removeClass(p),t&&t[0]&&(n.eq(t[0][0]).addClass(v[0]),1<x)))for(m=1;m<x;m++)n.eq(t[m][0]).addClass(v[m]||v[w])}),c.processTbody(b,f,!1);b=!1!==e.columns_thead?["thead tr"]:[];!1!==e.columns_tfoot&&b.push("tfoot tr");if(b.length&&(h=s.find(b.join(",")).children().removeClass(p),x))for(m=0;m<x;m++)h.filter('[data-column="'+t[m][0]+'"]').addClass(v[m]||v[w]);a.debug&&c.benchmark("Applying Columns widget", d)},remove:function(b,a,e){var d=a.$tbodies,f=(e.columns||["primary","secondary","tertiary"]).join(" ");a.$headers.removeClass(f);a.$table.children("tfoot").children("tr").children("th, td").removeClass(f);for(a=0;a<d.length;a++)e=c.processTbody(b,d.eq(a),!0),e.children("tr").each(function(){k(this).children().removeClass(f)}),c.processTbody(b,e,!1)}});
-c.addWidget({id:"filter",priority:50,options:{filter_childRows:!1,filter_columnFilters:!0,filter_cssFilter:"",filter_external:"",filter_filteredRow:"filtered", filter_formatter:null,filter_functions:null,filter_hideEmpty:!0,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_onlyAvail:"filter-onlyAvail",filter_placeholder:{search:"",select:""},filter_reset:null,filter_saveFilters:!1,filter_searchDelay:300,filter_selectSource:null,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_defaultAttrib:"data-value"},format:function(b,a,e){a.$table.hasClass("hasFilters")||c.filter.init(b,a,e)},remove:function(b,a, e){var d,f=a.$tbodies;a.$table.removeClass("hasFilters").unbind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter ")).find("."+c.css.filterRow).remove();for(a=0;a<f.length;a++)d=c.processTbody(b,f.eq(a),!0),d.children().removeClass(e.filter_filteredRow).show(),c.processTbody(b,d,!1);e.filter_reset&&k(document).undelegate(e.filter_reset,"click.tsfilter")}});
-c.filter={regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, child:/tablesorter-childRow/,filtered:/filtered/,type:/undefined|number/,exact:/(^[\"|\'|=]+)|([\"|\'|=]+$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g},types:{regex:function(b,a,e,d){if(c.filter.regex.regex.test(a)){var f;b=c.filter.regex.regex.exec(a);try{f=(new RegExp(b[1],b[2])).test(d)}catch(g){f=!1}return f}return null},operators:function(b,a,e,d,f,g,h,l,n){if(/^[<>]=?/.test(a)){var p;e=h.config;b=c.formatFloat(a.replace(c.filter.regex.operators,""),h);l=e.parsers[g];e=b;if(n[g]||"numeric"=== l.type)p=l.format(k.trim(""+a.replace(c.filter.regex.operators,"")),h,[],g),b="number"!==typeof p||""===p||isNaN(p)?b:p;d=!n[g]&&"numeric"!==l.type||isNaN(b)||"undefined"===typeof f?isNaN(d)?c.formatFloat(d.replace(c.filter.regex.nondigit,""),h):c.formatFloat(d,h):f;/>/.test(a)&&(p=/>=/.test(a)?d>=b:d>b);/</.test(a)&&(p=/<=/.test(a)?d<=b:d<b);p||""!==e||(p=!0);return p}return null},notMatch:function(b,a,e,d,f,g,h,l){if(/^\!/.test(a)){a=a.replace("!","");if(c.filter.regex.exact.test(a))return a=a.replace(c.filter.regex.exact, ""),""===a?!0:k.trim(a)!==d;b=d.search(k.trim(a));return""===a?!0:!(l.filter_startsWith?0===b:0<=b)}return null},exact:function(b,a,e,d,f,g,h,l,n,p){return c.filter.regex.exact.test(a)?(b=a.replace(c.filter.regex.exact,""),p?0<=k.inArray(b,p):b==d):null},and:function(b,a,e,d){if(c.filter.regex.andTest.test(b)){b=a.split(c.filter.regex.andSplit);a=0<=d.search(k.trim(b[0]));for(e=b.length-1;a&&e;)a=a&&0<=d.search(k.trim(b[e])),e--;return a}return null},range:function(b,a,e,d,f,g,h,l,k){if(c.filter.regex.toTest.test(a)){b= h.config;var p=a.split(c.filter.regex.toSplit);e=c.formatFloat(p[0].replace(c.filter.regex.nondigit,""),h);l=c.formatFloat(p[1].replace(c.filter.regex.nondigit,""),h);if(k[g]||"numeric"===b.parsers[g].type)a=b.parsers[g].format(""+p[0],h,b.$headers.eq(g),g),e=""===a||isNaN(a)?e:a,a=b.parsers[g].format(""+p[1],h,b.$headers.eq(g),g),l=""===a||isNaN(a)?l:a;a=!k[g]&&"numeric"!==b.parsers[g].type||isNaN(e)||isNaN(l)?isNaN(d)?c.formatFloat(d.replace(c.filter.regex.nondigit,""),h):c.formatFloat(d,h):f;e> l&&(d=e,e=l,l=d);return a>=e&&a<=l||""===e||""===l}return null},wild:function(b,a,e,d,f,g,h,l,n,p){return/[\?|\*]/.test(a)||c.filter.regex.orReplace.test(b)?(b=h.config,a=a.replace(c.filter.regex.orReplace,"|"),!b.$headers.filter('[data-column="'+g+'"]:last').hasClass("filter-match")&&/\|/.test(a)&&(a=k.isArray(p)?"("+a+")":"^("+a+")$"),(new RegExp(a.replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*"))).test(d)):null},fuzzy:function(b,a,c,d){if(/^~/.test(a)){b=0;c=d.length;var f=a.slice(1);for(a=0;a<c;a++)d[a]=== f[b]&&(b+=1);return b===f.length?!0:!1}return null}},init:function(b,a,e){c.language=k.extend(!0,{},{to:"to",or:"or",and:"and"},c.language);var d,f,g,h,l,n,p;d=c.filter.regex;a.debug&&(n=new Date);a.$table.addClass("hasFilters");k.extend(d,{child:new RegExp(a.cssChildRow),filtered:new RegExp(e.filter_filteredRow),alreadyFiltered:new RegExp("(\\s+("+c.language.or+"|-|"+c.language.to+")\\s+)","i"),toTest:new RegExp("\\s+(-|"+c.language.to+")\\s+","i"),toSplit:new RegExp("(?:\\s+(?:-|"+c.language.to+ ")\\s+)","gi"),andTest:new RegExp("\\s+("+c.language.and+"|&&)\\s+","i"),andSplit:new RegExp("(?:\\s+(?:"+c.language.and+"|&&)\\s+)","gi"),orReplace:new RegExp("\\s+("+c.language.or+")\\s+","gi")});!1!==e.filter_columnFilters&&a.$headers.filter(".filter-false").length!==a.$headers.length&&c.filter.buildRow(b,a,e);a.$table.bind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter "),function(d,g){a.$table.find("."+c.css.filterRow).toggle(!(e.filter_hideEmpty&& k.isEmptyObject(a.cache)));/(search|filter)/.test(d.type)||(d.stopPropagation(),c.filter.buildDefault(b,!0));"filterReset"===d.type?c.filter.searching(b,[]):"filterEnd"===d.type?c.filter.buildDefault(b,!0):(g="search"===d.type?g:"updateComplete"===d.type?a.$table.data("lastSearch"):"",/(update|add)/.test(d.type)&&"updateComplete"!==d.type&&(a.lastCombinedFilter=null,a.lastSearch=[]),c.filter.searching(b,g,!0));return!1});e.filter_reset&&(e.filter_reset instanceof k?e.filter_reset.click(function(){a.$table.trigger("filterReset")}): k(e.filter_reset).length&&k(document).undelegate(e.filter_reset,"click.tsfilter").delegate(e.filter_reset,"click.tsfilter",function(){a.$table.trigger("filterReset")}));if(e.filter_functions)for(h=0;h<a.columns;h++)if(p=c.getColumnData(b,e.filter_functions,h))if(g=a.$headers.filter('[data-column="'+h+'"]:last'),d="",!0===p&&!g.hasClass("filter-false"))c.filter.buildSelect(b,h);else if("object"===typeof p&&!g.hasClass("filter-false")){for(f in p)"string"===typeof f&&(d+=""===d?'<option value="">'+ (g.data("placeholder")||g.attr("data-placeholder")||e.filter_placeholder.select||"")+"</option>":"",d+='<option value="'+f+'">'+f+"</option>");a.$table.find("thead").find("select."+c.css.filter+'[data-column="'+h+'"]').append(d)}c.filter.buildDefault(b,!0);c.filter.bindSearch(b,a.$table.find("."+c.css.filter),!0);e.filter_external&&c.filter.bindSearch(b,e.filter_external);e.filter_hideFilters&&c.filter.hideFilters(b,a);a.showProcessing&&a.$table.bind("filterStart"+a.namespace+"filter filterEnd"+a.namespace+ "filter",function(d,e){g=e?a.$table.find("."+c.css.header).filter("[data-column]").filter(function(){return""!==e[k(this).data("column")]}):"";c.isProcessing(b,"filterStart"===d.type,e?g:"")});a.debug&&c.benchmark("Applying Filter widget",n);a.$table.bind("tablesorter-initialized pagerInitialized",function(){l=c.filter.setDefaults(b,a,e)||[];l.length&&c.setFilters(b,l,!0);a.$table.trigger("filterFomatterUpdate");c.filter.checkFilters(b,l)});e.filter_initialized=!0;a.$table.trigger("filterInit")}, setDefaults:function(b,a,e){var d,f=c.getFilters(b)||[];e.filter_saveFilters&&c.storage&&(d=c.storage(b,"tablesorter-filters")||[],(b=k.isArray(d))&&""===d.join("")||!b||(f=d));if(""===f.join(""))for(b=0;b<a.columns;b++)f[b]=a.$headers.filter('[data-column="'+b+'"]:last').attr(e.filter_defaultAttrib)||f[b];a.$table.data("lastSearch",f);return f},buildRow:function(b,a,e){var d,f,g,h,l=a.columns;g='<tr class="'+c.css.filterRow+'">';for(d=0;d<l;d++)g+="<td></td>";a.$filters=k(g+"</tr>").appendTo(a.$table.children("thead").eq(0)).find("td"); for(d=0;d<l;d++)f=a.$headers.filter('[data-column="'+d+'"]:last'),g=c.getColumnData(b,e.filter_functions,d),g=e.filter_functions&&g&&"function"!==typeof g||f.hasClass("filter-select"),h="false"===c.getData(f[0],c.getColumnData(b,a.headers,d),"filter"),g?g=k("<select>").appendTo(a.$filters.eq(d)):((g=c.getColumnData(b,e.filter_formatter,d))?((g=g(a.$filters.eq(d),d))&&0===g.length&&(g=a.$filters.eq(d).children("input")),g&&(0===g.parent().length||g.parent().length&&g.parent()[0]!==a.$filters[d])&& a.$filters.eq(d).append(g)):g=k('<input type="search">').appendTo(a.$filters.eq(d)),g&&g.attr("placeholder",f.data("placeholder")||f.attr("data-placeholder")||e.filter_placeholder.search||"")),g&&(f=(k.isArray(e.filter_cssFilter)?"undefined"!==typeof e.filter_cssFilter[d]?e.filter_cssFilter[d]||"":"":e.filter_cssFilter)||"",g.addClass(c.css.filter+" "+f).attr("data-column",d),h&&(g.attr("placeholder","").addClass("disabled")[0].disabled=!0))},bindSearch:function(b,a,e){b=k(b)[0];a=k(a);if(a.length){var d= b.config,f=d.widgetOptions,g=f.filter_$externalFilters;!0!==e&&(f.filter_$anyMatch=a.filter('[data-column="all"]'),f.filter_$externalFilters=g&&g.length?f.filter_$externalFilters.add(a):a,c.setFilters(b,d.$table.data("lastSearch")||[],!1===e));a.attr("data-lastSearchTime",(new Date).getTime()).unbind(["keypress","keyup","search","change",""].join(d.namespace+"filter ")).bind(["keyup","search","change",""].join(d.namespace+"filter "),function(a){k(this).attr("data-lastSearchTime",(new Date).getTime()); if(27===a.which)this.value="";else if("number"===typeof f.filter_liveSearch&&this.value.length<f.filter_liveSearch&&""!==this.value||"keyup"===a.type&&(32>a.which&&8!==a.which&&!0===f.filter_liveSearch&&13!==a.which||37<=a.which&&40>=a.which||13!==a.which&&!1===f.filter_liveSearch))return;c.filter.searching(b,"change"!==a.type,!0)}).bind("keypress."+d.namespace+"filter",function(a){13===a.which&&(a.preventDefault(),k(this).blur())});d.$table.bind("filterReset",function(){a.val("")})}},checkFilters:function(b, a,e){var d=b.config,f=d.widgetOptions,g=k.isArray(a),h=g?a:c.getFilters(b,!0),l=(h||[]).join("");if(!k.isEmptyObject(d.cache)&&(g&&c.setFilters(b,h,!1,!0!==e),f.filter_hideFilters&&d.$table.find("."+c.css.filterRow).trigger(""===l?"mouseleave":"mouseenter"),d.lastCombinedFilter!==l||!1===a))if(!1===a&&(d.lastCombinedFilter=null,d.lastSearch=[]),d.$table.trigger("filterStart",[h]),d.showProcessing)setTimeout(function(){c.filter.findRows(b,h,l);return!1},30);else return c.filter.findRows(b,h,l),!1}, hideFilters:function(b,a){var e,d,f;k(b).find("."+c.css.filterRow).addClass("hideme").bind("mouseenter mouseleave",function(b){e=k(this);clearTimeout(f);f=setTimeout(function(){/enter|over/.test(b.type)?e.removeClass("hideme"):k(document.activeElement).closest("tr")[0]!==e[0]&&""===a.lastCombinedFilter&&e.addClass("hideme")},200)}).find("input, select").bind("focus blur",function(b){d=k(this).closest("tr");clearTimeout(f);f=setTimeout(function(){if(""===c.getFilters(a.$table).join(""))d["focus"=== b.type?"removeClass":"addClass"]("hideme")},200)})},findRows:function(b,a,e){if(b.config.lastCombinedFilter!==e){var d,f,g,h,l,n,p,m,s,r,t,x,v,w,z,y,A,B,L,C,G,H,I,J,M,D,E=c.filter.regex,q=b.config,u=q.widgetOptions,N=q.columns,K=q.$table.children("tbody"),O=["range","notMatch","operators"],F=q.$headers.map(function(a){return q.parsers&&q.parsers[a]&&q.parsers[a].parsed||c.getData&&"parsed"===c.getData(q.$headers.filter('[data-column="'+a+'"]:last'),c.getColumnData(b,q.headers,a),"filter")||k(this).hasClass("filter-parsed")}).get(); q.debug&&(L=new Date);for(l=0;l<K.length;l++)if(!K.eq(l).hasClass(q.cssInfoBlock||c.css.info)){n=c.processTbody(b,K.eq(l),!0);m=q.columns;g=k(k.map(q.cache[l].normalized,function(a){return a[m].$row.get()}));if(""===e||u.filter_serversideFiltering)g.removeClass(u.filter_filteredRow).not("."+q.cssChildRow).show();else{g=g.not("."+q.cssChildRow);f=g.length;y=!0;p=q.lastSearch||q.$table.data("lastSearch")||[];for(r=0;r<m;r++)s=a[r]||"",y||(r=m),y=y&&p.length&&0===s.indexOf(p[r]||"")&&!E.alreadyFiltered.test(s)&& !/[=\"\|!]/.test(s)&&!(/(>=?\s*-\d)/.test(s)||/(<=?\s*\d)/.test(s))&&!(""!==s&&q.$filters&&q.$filters.eq(r).find("select").length&&!q.$headers.filter('[data-column="'+r+'"]:last').hasClass("filter-match"));p=g.not("."+u.filter_filteredRow).length;y&&0===p&&(y=!1);q.debug&&c.log("Searching through "+(y&&p<f?p:"all")+" rows");if(u.filter_$anyMatch&&u.filter_$anyMatch.length||a[q.columns])C=u.filter_$anyMatch&&u.filter_$anyMatch.val()||a[q.columns]||"",q.sortLocaleCompare&&(C=c.replaceAccents(C)),G= C.toLowerCase();for(h=0;h<f;h++)if(s=g[h].className,!(E.child.test(s)||y&&E.filtered.test(s))){B=!0;s=g.eq(h).nextUntil("tr:not(."+q.cssChildRow+")");r=s.length&&u.filter_childRows?s.text():"";r=u.filter_ignoreCase?r.toLocaleLowerCase():r;p=g.eq(h).children();C&&(H=p.map(function(a){F[a]?a=q.cache[l].normalized[h][a]:(a=u.filter_ignoreCase?k(this).text().toLowerCase():k(this).text(),q.sortLocaleCompare&&(a=c.replaceAccents(a)));return a}).get(),I=H.join(" "),J=I.toLowerCase(),M=q.cache[l].normalized[h].slice(0, -1).join(" "),A=null,k.each(c.filter.types,function(a,d){if(0>k.inArray(a,O)&&(w=d(C,G,I,J,M,N,b,u,F,H),null!==w))return A=w,!1}),B=null!==A?A:0<=(J+r).indexOf(G));for(m=0;m<N;m++)a[m]&&(d=q.cache[l].normalized[h][m],u.filter_useParsedData||F[m]?t=d:(t=k.trim(p.eq(m).text()),t=q.sortLocaleCompare?c.replaceAccents(t):t),x=!E.type.test(typeof t)&&u.filter_ignoreCase?t.toLocaleLowerCase():t,z=B,a[m]=q.sortLocaleCompare?c.replaceAccents(a[m]):a[m],v=u.filter_ignoreCase?(a[m]||"").toLocaleLowerCase(): a[m],(D=c.getColumnData(b,u.filter_functions,m))?!0===D?z=q.$headers.filter('[data-column="'+m+'"]:last').hasClass("filter-match")?0<=x.search(v):a[m]===t:"function"===typeof D?z=D(t,d,a[m],m,g.eq(h)):"function"===typeof D[a[m]]&&(z=D[a[m]](t,d,a[m],m,g.eq(h))):(A=null,k.each(c.filter.types,function(c,e){w=e(a[m],v,t,x,d,m,b,u,F);if(null!==w)return A=w,!1}),null!==A?z=A:(t=(x+r).indexOf(v),z=!u.filter_startsWith&&0<=t||u.filter_startsWith&&0===t)),B=z?B:!1);g.eq(h).toggle(B).toggleClass(u.filter_filteredRow, !B);s.length&&s.toggleClass(u.filter_filteredRow,!B)}}c.processTbody(b,n,!1)}q.lastCombinedFilter=e;q.lastSearch=a;q.$table.data("lastSearch",a);u.filter_saveFilters&&c.storage&&c.storage(b,"tablesorter-filters",a);q.debug&&c.benchmark("Completed filter widget search",L);q.$table.trigger("filterEnd");setTimeout(function(){q.$table.trigger("applyWidgets")},0)}},getOptionSource:function(b,a,e){var d,f=b.config,g=[],h=!1,l=f.widgetOptions.filter_selectSource,n=k.isFunction(l)?!0:c.getColumnData(b,l, a);!0===n?h=l(b,a,e):"object"===k.type(l)&&n&&(h=n(b,a,e));!1===h&&(h=c.filter.getOptions(b,a,e));h=k.grep(h,function(a,b){return k.inArray(a,h)===b});f.$headers.filter('[data-column="'+a+'"]:last').hasClass("filter-select-nosort")||(k.each(h,function(d,c){g.push({t:c,p:f.parsers&&f.parsers[a].format(c,b,[],a)||c})}),d=f.textSorter||"",g.sort(function(e,g){var f=e.p.toString(),h=g.p.toString();return k.isFunction(d)?d(f,h,!0,a,b):"object"===typeof d&&d.hasOwnProperty(a)?d[a](f,h,!0,a,b):c.sortNatural? c.sortNatural(f,h):!0}),h=[],k.each(g,function(a,b){h.push(b.t)}));return h},getOptions:function(b,a,c){var d,f,g,h,l=b.config,n=l.widgetOptions,p=l.$table.children("tbody"),m=[];for(d=0;d<p.length;d++)if(!p.eq(d).hasClass(l.cssInfoBlock))for(h=l.cache[d],f=l.cache[d].normalized.length,b=0;b<f;b++)g=h.row?h.row[b]:h.normalized[b][l.columns].$row[0],c&&g.className.match(n.filter_filteredRow)||(n.filter_useParsedData?m.push(""+h.normalized[b][a]):(g=g.cells[a])&&m.push(k.trim(g.textContent||g.innerText|| k(g).text())));return m},buildSelect:function(b,a,e,d){if(b.config.cache&&!k.isEmptyObject(b.config.cache)){a=parseInt(a,10);var f;f=b.config;var g=f.widgetOptions,h=f.$headers.filter('[data-column="'+a+'"]:last'),h='<option value="">'+(h.data("placeholder")||h.attr("data-placeholder")||g.filter_placeholder.select||"")+"</option>",l=c.filter.getOptionSource(b,a,d),n=f.$table.find("thead").find("select."+c.css.filter+'[data-column="'+a+'"]').val();for(b=0;b<l.length;b++)d=l[b].replace(/\"/g,"&quot;"), h+=""!==l[b]?'<option value="'+d+'"'+(n===d?' selected="selected"':"")+">"+l[b]+"</option>":"";f=(f.$filters?f.$filters:f.$table.children("thead")).find("."+c.css.filter);g.filter_$externalFilters&&(f=f&&f.length?f.add(g.filter_$externalFilters):g.filter_$externalFilters);f.filter('select[data-column="'+a+'"]')[e?"html":"append"](h);g.filter_functions||(g.filter_functions={});g.filter_functions[a]=!0}},buildDefault:function(b,a){var e,d,f=b.config,g=f.widgetOptions,h=f.columns;for(e=0;e<h;e++)d=f.$headers.filter('[data-column="'+ e+'"]:last'),!d.hasClass("filter-select")&&!0!==c.getColumnData(b,g.filter_functions,e)||d.hasClass("filter-false")||c.filter.buildSelect(b,e,a,d.hasClass(g.filter_onlyAvail))},searching:function(b,a,e){if("undefined"===typeof a||!0===a){var d=b.config.widgetOptions;clearTimeout(d.searchTimer);d.searchTimer=setTimeout(function(){c.filter.checkFilters(b,a,e)},d.filter_liveSearch?d.filter_searchDelay:10)}else c.filter.checkFilters(b,a,e)}};
-c.getFilters=function(b,a,e,d){var f,g=!1,h=b?k(b)[0].config: "",l=h?h.widgetOptions:"";if(!0!==a&&l&&!l.filter_columnFilters)return k(b).data("lastSearch");if(h&&(h.$filters&&(f=h.$filters.find("."+c.css.filter)),l.filter_$externalFilters&&(f=f&&f.length?f.add(l.filter_$externalFilters):l.filter_$externalFilters),f&&f.length))for(g=e||[],b=0;b<h.columns+1;b++)a=f.filter('[data-column="'+(b===h.columns?"all":b)+'"]'),a.length&&(a=a.sort(function(a,b){return k(b).attr("data-lastSearchTime")-k(a).attr("data-lastSearchTime")}),k.isArray(e)?(d?a.slice(1):a).val(e[b]).trigger("change.tsfilter"): (g[b]=a.val()||"",a.slice(1).val(g[b])),b===h.columns&&a.length&&(l.filter_$anyMatch=a));0===g.length&&(g=!1);return g};
-c.setFilters=function(b,a,e,d){var f=b?k(b)[0].config:"";b=c.getFilters(b,!0,a,d);f&&e&&(f.lastCombinedFilter=null,f.lastSearch=[],c.filter.searching(f.$table[0],a,d),f.$table.trigger("filterFomatterUpdate"));return!!b};
-c.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"",stickyHeaders_attachTo:null,stickyHeaders_offset:0,stickyHeaders_filteredToTop:!0,stickyHeaders_cloneId:"-sticky", stickyHeaders_addResizeEvent:!0,stickyHeaders_includeCaption:!0,stickyHeaders_zIndex:2},format:function(b,a,e){if(!(a.$table.hasClass("hasStickyHeaders")||0<=k.inArray("filter",a.widgets)&&!a.$table.hasClass("hasFilters"))){var d=a.$table,f=k(e.stickyHeaders_attachTo),g=d.children("thead:first"),h=f.length?f:k(window),l=g.children("tr").not(".sticky-false").children(),n="."+c.css.headerIn,p=d.find("tfoot"),m=isNaN(e.stickyHeaders_offset)?k(e.stickyHeaders_offset):"",s=f.length?0:m.length?m.height()|| 0:parseInt(e.stickyHeaders_offset,10)||0,r=e.$sticky=d.clone().addClass("containsStickyHeaders").css({position:f.length?"absolute":"fixed",margin:0,top:s,left:0,visibility:"hidden",zIndex:e.stickyHeaders_zIndex?e.stickyHeaders_zIndex:2}),t=r.children("thead:first").addClass(c.css.sticky+" "+e.stickyHeaders),x,v="",w=0,z="collapse"!==d.css("border-collapse")&&!/(webkit|msie)/i.test(navigator.userAgent),y=function(){s=m.length?m.height()||0:parseInt(e.stickyHeaders_offset,10)||0;w=0;z&&(w=2*parseInt(l.eq(0).css("border-left-width"), 10));r.css({left:f.length?(parseInt(f.css("padding-left"),10)||0)+parseInt(a.$table.css("padding-left"),10)+parseInt(a.$table.css("margin-left"),10)+parseInt(d.css("border-left-width"),10):g.offset().left-h.scrollLeft()-w,width:d.width()});x.filter(":visible").each(function(b){b=l.filter(":visible").eq(b);var d=z&&k(this).attr("data-column")===""+parseInt(a.columns/2,10)?1:0;k(this).css({width:b.width()-w}).find(n).width(b.find(n).width()-d)})};r.attr("id")&&(r[0].id+=e.stickyHeaders_cloneId);r.find("thead:gt(0), tr.sticky-false").hide(); r.find("tbody, tfoot").remove();e.stickyHeaders_includeCaption?r.find("caption").css("margin-left","-1px"):r.find("caption").remove();x=t.children().children();r.css({height:0,width:0,padding:0,margin:0,border:0});x.find("."+c.css.resizer).remove();d.addClass("hasStickyHeaders").bind("pagerComplete.tsSticky",function(){y()});c.bindEvents(b,t.children().children(".tablesorter-header"));d.after(r);h.bind("scroll.tsSticky resize.tsSticky",function(a){if(d.is(":visible")){var b=d.offset(),c=e.stickyHeaders_includeCaption? 0:d.find("caption").outerHeight(!0),c=(f.length?f.offset().top:h.scrollTop())+s-c,k=d.height()-(r.height()+(p.height()||0)),b=c>b.top&&c<b.top+k?"visible":"hidden",c={visibility:b};f.length?c.top=f.scrollTop():c.left=g.offset().left-h.scrollLeft()-w;r.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+b).css(c);if(b!==v||"resize"===a.type)y(),v=b}});e.stickyHeaders_addResizeEvent&&c.addHeaderResizeEvent(b);d.hasClass("hasFilters")&&(d.bind("filterEnd", function(){var b=k(document.activeElement).closest("td"),b=b.parent().children().index(b);r.hasClass(c.css.stickyVis)&&e.stickyHeaders_filteredToTop&&(window.scrollTo(0,d.position().top),0<=b&&a.$filters&&a.$filters.eq(b).find("a, select, input").filter(":visible").focus())}),c.filter.bindSearch(d,x.find("."+c.css.filter)),e.filter_hideFilters&&c.filter.hideFilters(r,a));d.trigger("stickyHeadersInit")}},remove:function(b,a,e){a.$table.removeClass("hasStickyHeaders").unbind("pagerComplete.tsSticky").find("."+ c.css.sticky).remove();e.$sticky&&e.$sticky.length&&e.$sticky.remove();k(".hasStickyHeaders").length||k(window).unbind("scroll.tsSticky resize.tsSticky");c.addHeaderResizeEvent(b,!1)}});
-c.addWidget({id:"resizable",priority:40,options:{resizable:!0,resizable_addLastColumn:!1,resizable_widths:[]},format:function(b,a,e){if(!a.$table.hasClass("hasResizable")){a.$table.addClass("hasResizable");c.resizableReset(b,!0);var d,f,g,h,l={},n=a.$table,p=0,m=null,s=null,r=20>Math.abs(n.parent().width()-n.width()), t=function(){c.storage&&m&&s&&(l={},l[m.index()]=m.width(),l[s.index()]=s.width(),m.width(l[m.index()]),s.width(l[s.index()]),!1!==e.resizable&&c.storage(b,"tablesorter-resizable",a.$headers.map(function(){return k(this).width()}).get()));p=0;m=s=null;k(window).trigger("resize")};if(l=c.storage&&!1!==e.resizable?c.storage(b,"tablesorter-resizable"):{})for(h in l)!isNaN(h)&&h<a.$headers.length&&a.$headers.eq(h).width(l[h]);d=n.children("thead:first").children("tr");d.children().each(function(){var e; e=k(this);h=e.attr("data-column");e="false"===c.getData(e,c.getColumnData(b,a.headers,h),"resizable");d.children().filter('[data-column="'+h+'"]')[e?"addClass":"removeClass"]("resizable-false")});d.each(function(){g=k(this).children().not(".resizable-false");k(this).find("."+c.css.wrapper).length||g.wrapInner('<div class="'+c.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>');e.resizable_addLastColumn||(g=g.slice(0,-1));f=f?f.add(g):g});f.each(function(){var a=k(this),b=parseInt(a.css("padding-right"), 10)+10;a.find("."+c.css.wrapper).append('<div class="'+c.css.resizer+'" style="cursor:w-resize;position:absolute;z-index:1;right:-'+b+'px;top:0;height:100%;width:20px;"></div>')}).bind("mousemove.tsresize",function(a){if(0!==p&&m){var b=a.pageX-p,c=m.width();m.width(c+b);m.width()!==c&&r&&s.width(s.width()-b);p=a.pageX}}).bind("mouseup.tsresize",function(){t()}).find("."+c.css.resizer+",."+c.css.grip).bind("mousedown",function(b){m=k(b.target).closest("th");var c=a.$headers.filter('[data-column="'+ m.attr("data-column")+'"]');1<c.length&&(m=m.add(c));s=b.shiftKey?m.parent().find("th").not(".resizable-false").filter(":last"):m.nextAll(":not(.resizable-false)").eq(0);p=b.pageX});n.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize",function(){t()}).bind("contextmenu.tsresize",function(){c.resizableReset(b);var a=k.isEmptyObject?k.isEmptyObject(l):!0;l={};return a})}},remove:function(b,a){a.$table.removeClass("hasResizable").children("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").children("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find("."+ c.css.resizer+",."+c.css.grip).remove();c.resizableReset(b)}});
-c.resizableReset=function(b,a){k(b).each(function(){var e,d=this.config,f=d&&d.widgetOptions;b&&d&&(d.$headers.each(function(a){e=k(this);f.resizable_widths[a]?e.css("width",f.resizable_widths[a]):e.hasClass("resizable-false")||e.css("width","")}),c.storage&&!a&&c.storage(this,"tablesorter-resizable",{}))})};
-c.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(b,a,c,d){a.format(b,c,d,!0)},format:function(b,a,e,d){var f, g=a.$table;e=!1!==e.saveSort;var h={sortList:a.sortList};a.debug&&(f=new Date);g.hasClass("hasSaveSort")?e&&b.hasInitialized&&c.storage&&(c.storage(b,"tablesorter-savesort",h),a.debug&&c.benchmark("saveSort widget: Saving last sort: "+a.sortList,f)):(g.addClass("hasSaveSort"),h="",c.storage&&(h=(e=c.storage(b,"tablesorter-savesort"))&&e.hasOwnProperty("sortList")&&k.isArray(e.sortList)?e.sortList:"",a.debug&&c.benchmark('saveSort: Last sort loaded: "'+h+'"',f),g.bind("saveSortReset",function(a){a.stopPropagation(); c.storage(b,"tablesorter-savesort","")})),d&&h&&0<h.length?a.sortList=h:b.hasInitialized&&h&&0<h.length&&g.trigger("sorton",[h]))},remove:function(b){c.storage&&c.storage(b,"tablesorter-savesort","")}})
-})(jQuery);
diff --git a/kcov-38/data/js/kcov.js b/kcov-38/data/js/kcov.js
deleted file mode 100644
index 73b5e36d1f0b..000000000000
--- a/kcov-38/data/js/kcov.js
+++ /dev/null
@@ -1,78 +0,0 @@
-window.onload = function () {
-
-	// http://stackoverflow.com/questions/8853396/logical-operator-in-a-handlebars-js-if-conditional
-	Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
-		switch (operator) {
-		case '==':
-			return (v1 == v2) ? options.fn(this) : options.inverse(this);
-		case '===':
-			return (v1 === v2) ? options.fn(this) : options.inverse(this);
-		case '<':
-			return (v1 < v2) ? options.fn(this) : options.inverse(this);
-		case '<=':
-			return (v1 <= v2) ? options.fn(this) : options.inverse(this);
-		case '>':
-			return (v1 > v2) ? options.fn(this) : options.inverse(this);
-		case '>=':
-			return (v1 >= v2) ? options.fn(this) : options.inverse(this);
-		case '&&':
-			return (v1 && v2) ? options.fn(this) : options.inverse(this);
-		case '||':
-			return (v1 || v2) ? options.fn(this) : options.inverse(this);
-		default:
-			return options.inverse(this);
-		}
-	});
-
-	// http://stackoverflow.com/questions/17095813/handlebars-if-and-numeric-zeroes
-	Handlebars.registerHelper('exists', function(variable, options) {
-	    if (typeof variable !== 'undefined') {
-	        return options.fn(this);
-	    } else {
-	        return options.inverse(this);
-	    }
-	});
-
-	var filesElement = document.getElementById("files-template")
-	if (filesElement) {
-		var source   = filesElement.innerHTML;
-		var template = Handlebars.compile(source);
-
-		document.getElementById('files-placeholder').innerHTML = template(data);
-	}
-	var linesElement = document.getElementById("lines-template")
-	if (linesElement) {
-		var source   = linesElement.innerHTML;
-		var template = Handlebars.compile(source);
-		document.getElementById('lines-placeholder').innerHTML = template(data);
-	}
-
-	elem = document.getElementById('header-percent-covered')
-
-	elem.className = toCoverPercentString(header.covered, header.instrumented);
-	elem.innerHTML = ((header.covered / header.instrumented) * 100).toFixed(1) + "%";	    
-
-	document.getElementById('header-command').innerHTML = header.command;
-	document.getElementById('window-title').innerHTML = "Coverage report - " + header.command;
-	document.getElementById('header-date').innerHTML = header.date;
-	document.getElementById('header-covered').innerHTML = header.covered
-	document.getElementById('header-instrumented').innerHTML = header.instrumented
-
-	$("#index-table").tablesorter({
-		theme : 'blue',
-		sortList : [[1,0]],
-		cssInfoBlock : "tablesorter-no-sort",
-		widgets: ["saveSort"],
-	});
-}
-
-function toCoverPercentString (covered, instrumented) {
-	perc = (covered / instrumented) * 100;
-
-	if (perc <= percent_low)
-		return "coverPerLeftLo";
-	else if (perc >= percent_high)
-		return "coverPerLeftHi";
-
-	return "coverPerLeftMed";
-}
diff --git a/kcov-38/data/source-file.html b/kcov-38/data/source-file.html
deleted file mode 100644
index bec158ded4cb..000000000000
--- a/kcov-38/data/source-file.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta charset="utf-8">
-  <title id="window-title">???</title>
-  <link rel="stylesheet" type="text/css" href="../data/bcov.css"/>
-</head>
-<script type="text/javascript" src="data/js/jquery.min.js"></script>
-<script type="text/javascript" src="data/js/handlebars.js"></script>
-<script type="text/javascript" src="data/js/kcov.js"></script>
-
-<body>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr><td class="title">Coverage Report</td></tr>
-  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
-  <tr>
-    <td width="100%">
-      <table cellpadding="1" border="0" width="100%">
-        <tr id="command">
-          <td class="headerItem" width="20%">Command:</td>
-          <td id="header-command" class="headerValue" width="60%" colspan=4>???</td>
-          <td><span class="lineNumLegend">Line number</span></td>
-        </tr>
-        <tr>
-          <td class="headerItem" width="20%">Date: </td>
-          <td id="header-date" class="headerValue" width="20%" colspan=2></td>
-          <td class="headerItem" width="20%">Instrumented lines:</td>
-          <td id="header-instrumented" class="headerValue" width="20%">???</td>
-          <td><span class="coverHitsLegend">Hits</span></td>
-        </tr>
-        <tr>
-          <td class="headerItem" width="20%">Code covered:</td>
-          <td id="header-percent-covered" width="20%" colspan=2>???</td>
-          <td class="headerItem" width="20%">Executed lines:</td>
-          <td id="header-covered" class="headerValue" width="20%">???</td>
-          <td><span class="orderNumLegend">Order</span></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td class="ruler"><img src="data/glass.png" width="3" height="3" alt=""/></td></tr>
-</table>
-
-<script id="lines-template" type="text/x-handlebars-template">
-<pre class="source" id="main-data">
-{{#each lines}}
-{{#ifCond possible_hits "==" "0"}}
-<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">{{hits}} </span><span class="{{class}}"> {{line}}</span></span><span class="orderNum"> {{order}}</span></source-line>
-{{else}}
- {{#exists possible_hits}}
-<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">{{hits}} / {{possible_hits}}</span><span class="{{class}}"> {{line}}</span><span class="orderNum"> {{order}}</span></source-line>
- {{else}}
-   {{#exists class}}
-<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">&nbsp;</span><span class="{{class}}"> {{line}}</span></span><span class="orderNum">&nbsp;</span></source-line>
-   {{else}}
-<source-line><span class="lineNum">{{lineNum}}</span><span class="coverHits">&nbsp;</span><span class="{{class}}"> {{line}}</span><span class="orderNum">&nbsp;</span></source-line>
-   {{/exists}}
- {{/exists}}
-{{/ifCond}}
-{{/each}}
-</pre>
-</script>
-<div id="lines-placeholder"></div>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0" id="merged-data">
-  <tr><td class="ruler"><img src="data/amber.png" width="3" height="3" alt=""/></td></tr>
-  <tr><td class="versionInfo">Generated by: <a href="http://simonkagstrom.github.com/kcov/index.html">Kcov</a></td></tr>
-</table>
-</body>
-</html>
diff --git a/kcov-38/data/tablesorter-theme.css b/kcov-38/data/tablesorter-theme.css
deleted file mode 100644
index 74e9ef202ef8..000000000000
--- a/kcov-38/data/tablesorter-theme.css
+++ /dev/null
@@ -1,221 +0,0 @@
-/*************
-  Blue Theme
- *************/
-/* overall */
-.tablesorter-blue {
-	width: 100%;
-	background-color: #fff;
-	margin: 10px 0 15px;
-	text-align: left;
-	border-spacing: 0;
-	border: #cdcdcd 1px solid;
-	border-width: 1px 0 0 1px;
-}
-.tablesorter-blue th,
-.tablesorter-blue td {
-	border: #cdcdcd 1px solid;
-	border-width: 0 1px 1px 0;
-}
-
-/* header */
-.tablesorter-blue th,
-.tablesorter-blue thead td {
-	font: bold 12px/18px Arial, Sans-serif;
-	color: #000;
-	background-color: #99bfe6;
-	border-collapse: collapse;
-	padding: 4px;
-	text-shadow: 0 1px 0 rgba(204, 204, 204, 0.7);
-}
-.tablesorter-blue tbody td,
-.tablesorter-blue tfoot th,
-.tablesorter-blue tfoot td {
-	padding: 4px;
-	vertical-align: top;
-}
-.tablesorter-blue .header,
-.tablesorter-blue .tablesorter-header {
-	/* black (unsorted) double arrow */
-	background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);
-	/* white (unsorted) double arrow */
-	/* background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); */
-	/* image */
-	/* background-image: url(images/black-unsorted.gif); */
-	background-repeat: no-repeat;
-	background-position: center right;
-	padding: 4px 18px 4px 4px;
-	white-space: normal;
-	cursor: pointer;
-}
-.tablesorter-blue .headerSortUp,
-.tablesorter-blue .tablesorter-headerSortUp,
-.tablesorter-blue .tablesorter-headerAsc {
-	background-color: #9fbfdf;
-	/* black asc arrow */
-	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
-	/* white asc arrow */
-	/* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); */
-	/* image */
-	/* background-image: url(images/black-asc.gif); */
-}
-.tablesorter-blue .headerSortDown,
-.tablesorter-blue .tablesorter-headerSortDown,
-.tablesorter-blue .tablesorter-headerDesc {
-	background-color: #8cb3d9;
-	/* black desc arrow */
-	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
-	/* white desc arrow */
-	/* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); */
-	/* image */
-	/* background-image: url(images/black-desc.gif); */
-}
-.tablesorter-blue thead .sorter-false {
-	background-image: none;
-	cursor: default;
-	padding: 4px;
-}
-
-/* tfoot */
-.tablesorter-blue tfoot .tablesorter-headerSortUp,
-.tablesorter-blue tfoot .tablesorter-headerSortDown,
-.tablesorter-blue tfoot .tablesorter-headerAsc,
-.tablesorter-blue tfoot .tablesorter-headerDesc {
-	/* remove sort arrows from footer */
-	background-image: none;
-}
-
-/* tbody */
-.tablesorter-blue td {
-	color: #3d3d3d;
-	background-color: #fff;
-	padding: 4px;
-	vertical-align: top;
-}
-
-/* hovered row colors
- you'll need to add additional lines for
- rows with more than 2 child rows
- */
-.tablesorter-blue tbody > tr:hover > td,
-.tablesorter-blue tbody > tr:hover + tr.tablesorter-childRow > td,
-.tablesorter-blue tbody > tr:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td,
-.tablesorter-blue tbody > tr.even:hover > td,
-.tablesorter-blue tbody > tr.even:hover + tr.tablesorter-childRow > td,
-.tablesorter-blue tbody > tr.even:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #d9d9d9;
-}
-.tablesorter-blue tbody > tr.odd:hover > td,
-.tablesorter-blue tbody > tr.odd:hover + tr.tablesorter-childRow > td,
-.tablesorter-blue tbody > tr.odd:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #bfbfbf;
-}
-
-/* table processing indicator */
-.tablesorter-blue .tablesorter-processing {
-	background-position: center center !important;
-	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
-	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
-}
-
-/* Zebra Widget - row alternating colors */
-.tablesorter-blue tbody tr.odd td {
-	background-color: #ebf2fa;
-}
-.tablesorter-blue tbody tr.even td {
-	background-color: #fff;
-}
-
-/* Column Widget - column sort colors */
-.tablesorter-blue td.primary,
-.tablesorter-blue tr.odd td.primary {
-	background-color: #99b3e6;
-}
-.tablesorter-blue tr.even td.primary {
-	background-color: #c2d1f0;
-}
-.tablesorter-blue td.secondary,
-.tablesorter-blue tr.odd td.secondary {
-	background-color: #c2d1f0;
-}
-.tablesorter-blue tr.even td.secondary {
-	background-color: #d6e0f5;
-}
-.tablesorter-blue td.tertiary,
-.tablesorter-blue tr.odd td.tertiary {
-	background-color: #d6e0f5;
-}
-.tablesorter-blue tr.even td.tertiary {
-	background-color: #ebf0fa;
-}
-
-/* caption */
-caption {
-	background: #fff;
-}
-
-/* filter widget */
-.tablesorter-blue .tablesorter-filter-row td {
-	background: #eee;
-	line-height: normal;
-	text-align: center; /* center the input */
-	-webkit-transition: line-height 0.1s ease;
-	-moz-transition: line-height 0.1s ease;
-	-o-transition: line-height 0.1s ease;
-	transition: line-height 0.1s ease;
-}
-/* optional disabled input styling */
-.tablesorter-blue .tablesorter-filter-row .disabled {
-	opacity: 0.5;
-	filter: alpha(opacity=50);
-	cursor: not-allowed;
-}
-/* hidden filter row */
-.tablesorter-blue .tablesorter-filter-row.hideme td {
-	/*** *********************************************** ***/
-	/*** change this padding to modify the thickness     ***/
-	/*** of the closed filter row (height = padding x 2) ***/
-	padding: 2px;
-	/*** *********************************************** ***/
-	margin: 0;
-	line-height: 0;
-	cursor: pointer;
-}
-.tablesorter-blue .tablesorter-filter-row.hideme .tablesorter-filter {
-	height: 1px;
-	min-height: 0;
-	border: 0;
-	padding: 0;
-	margin: 0;
-	/* don't use visibility: hidden because it disables tabbing */
-	opacity: 0;
-	filter: alpha(opacity=0);
-}
-/* filters */
-.tablesorter-blue .tablesorter-filter {
-	width: 98%;
-	height: auto;
-	margin: 0;
-	padding: 4px;
-	background-color: #fff;
-	border: 1px solid #bbb;
-	color: #333;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	-webkit-transition: height 0.1s ease;
-	-moz-transition: height 0.1s ease;
-	-o-transition: height 0.1s ease;
-	transition: height 0.1s ease;
-}
-/* rows hidden by filtering (needed for child rows) */
-.tablesorter .filtered {
-	display: none;
-}
-
-/* ajax error row */
-.tablesorter .tablesorter-errorRow td {
-	text-align: center;
-	cursor: pointer;
-	background-color: #e6bf99;
-}
diff --git a/kcov-38/debian/.gitignore b/kcov-38/debian/.gitignore
deleted file mode 100644
index 9c1b1314340f..000000000000
--- a/kcov-38/debian/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-debhelper-build-stamp
-files
-kcov.substvars
diff --git a/kcov-38/debian/README b/kcov-38/debian/README
deleted file mode 100644
index 79d1dd3cf5ab..000000000000
--- a/kcov-38/debian/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package kcov
-----------------------------
-
-Comments regarding the Package
-
- -- Paul Dreik <github@pauldreik.se>  Fri, 21 Sep 2018 12:39:22 +0200
diff --git a/kcov-38/debian/changelog b/kcov-38/debian/changelog
deleted file mode 100644
index 676ea0bdd78a..000000000000
--- a/kcov-38/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-kcov (36) unstable; urgency=medium
-
-  * Initial Release.
-
- -- Paul Dreik <github@pauldreik.se>  Fri, 21 Sep 2018 12:39:22 +0200
diff --git a/kcov-38/debian/compat b/kcov-38/debian/compat
deleted file mode 100644
index f599e28b8ab0..000000000000
--- a/kcov-38/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/kcov-38/debian/control b/kcov-38/debian/control
deleted file mode 100644
index 4a01b1f91bb4..000000000000
--- a/kcov-38/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: kcov
-Section: unknown
-Priority: optional
-Maintainer: Paul Dreik <github@pauldreik.se>
-Build-Depends: debhelper (>= 10), cmake, binutils-dev,  libcurl4-openssl-dev, zlib1g-dev,  libdw-dev, libiberty-dev 
-Standards-Version: 4.1.2
-Homepage: https://github.com/SimonKagstrom/kcov
-#Vcs-Git: https://anonscm.debian.org/git/collab-maint/kcov.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/kcov.git
-
-Package: kcov
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: tool for generating and viewing code coverage
- kcov is a tool for generating coverage from a binary.
- The binary needs to be built with debug information.
- The output is by default html, which can be interactively
- explored with a web browser.
-
diff --git a/kcov-38/debian/copyright b/kcov-38/debian/copyright
deleted file mode 100644
index 33e49d6130cb..000000000000
--- a/kcov-38/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kcov
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-3.0+
-
-Files: debian/*
-Copyright: 2018 Paul Dreik <github@pauldreik.se>
-License: GPL-3.0+
-
-License: GPL-3.0+
- 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 package 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 <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/kcov-38/debian/kcov-docs.docs b/kcov-38/debian/kcov-docs.docs
deleted file mode 100644
index 3609b989a6d9..000000000000
--- a/kcov-38/debian/kcov-docs.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README.Debian
-README.source
-README
diff --git a/kcov-38/debian/rules b/kcov-38/debian/rules
deleted file mode 100755
index e1c367c12388..000000000000
--- a/kcov-38/debian/rules
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-%:
-	dh $@
-
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
diff --git a/kcov-38/debian/source/format b/kcov-38/debian/source/format
deleted file mode 100644
index 89ae9db8f88b..000000000000
--- a/kcov-38/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/kcov-38/doc/CMakeLists.txt b/kcov-38/doc/CMakeLists.txt
deleted file mode 100644
index af6a8316ccf9..000000000000
--- a/kcov-38/doc/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install (FILES kcov.1 DESTINATION "${KCOV_INSTALL_MANDIR}/man1" )
diff --git a/kcov-38/doc/codecov.md b/kcov-38/doc/codecov.md
deleted file mode 100644
index 75e068e56375..000000000000
--- a/kcov-38/doc/codecov.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Travis-ci / codecov integration
----------------------------------
-Integrating with [codecov](http://codecov.io) is easy to do. To upload data from the travis build to codecov, run kcov normally, and then upload using the codecov uploader
-
-```
-kcov /path/to/outdir executable
-bash <(curl -s https://codecov.io/bash) -s /path/to/outdir
-```
-
-The easiest way to achieve this is to run the codecov uploader on travis success:
-
-```
-after_success:
-  - bash <(curl -s https://codecov.io/bash) -s /path/to/outdir
-```
-
-the -s /path/to/outdir part can be skipped if kcov produces output in the current directory.
diff --git a/kcov-38/doc/coveralls.md b/kcov-38/doc/coveralls.md
deleted file mode 100644
index 3849171ecd33..000000000000
--- a/kcov-38/doc/coveralls.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Travis-ci / coveralls integration
----------------------------------
-kcov is easy to integrate with [travis-ci](http://travis-ci.org) and
-[coveralls.io](http://coveralls.io). To upload data from the travis build to coveralls,
-run kcov with
-
-```
-kcov --coveralls-id=$TRAVIS_JOB_ID /path/to/outdir executable
-```
-
-which in addition to regular coverage collection uploads to coveralls.
diff --git a/kcov-38/doc/design.txt b/kcov-38/doc/design.txt
deleted file mode 100644
index 1e4a1dd8c223..000000000000
--- a/kcov-38/doc/design.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Classes
-=======
-The kcov design is based on a number of classes:
-
-FileParser
-----------
-Reads the binary to parse debugging information, i.e., file/line -> address
-mappings, and reports these to listeners. For ELF binaries, this is done on
-startup, Python and Bash report during runtime.
-
-Collector
----------
-Controls execution, setup breakpoints, catch signals etc, and report breakpoint
-hits. 
-
-Engine
-------
-Low-level control of execution (i.e., setup breakpoints, start/stop execution).
-
-Reporter
---------
-Reports breakpoint hits and can be queried for address -> file/line mappings.
-Also reads back accumulated data from previous runs.
-
-OutputHandler
--------------
-Receives files from the parser and allows writers to register. Will call into
-writers at regular intervals.
-
-Writer
-------
-Queries the reporter to produce HTML and cobertura (currently) output with
-coverage data.
-
-
-Python/bash
-===========
-The above classes are mainly modelled for dwarf/ptrace-based applications.
-When covering python/bash code, the FileParser and Engine interfaces are
-implemented by the same class since coverage data is collected during runtime.
-
-Merge parser
-============
-
-@startuml
-interface FileParser
-interface Engine
-interface Writer
-
-class Configuration
-class Collector
-class Reporter
-class Filter
-
-PtraceEngine -up-|> Engine
-BashEngine -up-|> Engine
-PythonEngine -up-|> Engine
-LLDBEngine -up-|> Engine
-
-BashEngine -down-|> FileParser
-PythonEngine -down-|> FileParser
-LLDBEngine -down-|> FileParser
-
-ElfParser -up-|> FileParser
-
-HTMLWriter -down-|> Writer
-CoberturaWriter -down-|> Writer
-JSONWriter -down-|> Writer
-CoverallsWriter -down-|> Writer
-SonarQubeWriter -down-|> Writer
-
-Collector -- Engine : Sets/collects breakpoints
-Collector -- FileParser : Receives file/line/address
-Collector -- Reporter : Recieves executed lines
-
-Reporter -- Writer : Reports executed lines
-
-@enduml
\ No newline at end of file
diff --git a/kcov-38/doc/full-system-instrumentation.md b/kcov-38/doc/full-system-instrumentation.md
deleted file mode 100644
index 1287890d859f..000000000000
--- a/kcov-38/doc/full-system-instrumentation.md
+++ /dev/null
@@ -1,35 +0,0 @@
-## *Full system instrumentation with kcov*
-Prerequisites
--------------
-You need to install patchelf >= 0.9 on your system before recording. Patchelf can be found
-on https://github.com/NixOS/patchelf, or as a package on some distributions (note the version
-though!).
-
-
-Add the kcov-system-daemon to your target system
-------------------------------------------------
-You need to add kcov-system-daemon to your target system and start it early during system
-bootup. This is needed in order to process instrumentation points and write report data.
-
-Instrumenting binaries for a target system
-------------------------------------------
-If your binaries (with debug symbols) are in e.g., sysroot, you can instrument binaries using
-
-```
-kcov-system --system-record /tmp/out-sysroot sysroot
-```
-
-After this finishes, build your filesystem (squashfs etc) using the instrumented binaries
-and install and run on your target.
-
-Note that ```--system-record``` also produces a shared library (libkcov_system_lib) which
-needs to be available in the library on the target system. kcov places it in ```/lib``` under
-```/tmp/out-sysroot```.
-
-Creating a report from the collected data
------------------------------------------
-Copy `/tmp/kcov-data` from your target system and run
-
-```
-kcov-system --system-report /tmp/kcov /tmp/kcov-data
-```
diff --git a/kcov-38/doc/gitlab.md b/kcov-38/doc/gitlab.md
deleted file mode 100644
index 4291ae81e076..000000000000
--- a/kcov-38/doc/gitlab.md
+++ /dev/null
@@ -1,8 +0,0 @@
-GitLab CI integration
----------------------
-Kcov generates a very generic json file which includes the overall percent covered
-for a single command and the count of lines instrumented and covered. It also includes
-a summary of each source file with a percentage and line counts. This allows easy
-integration with GitlabCI (see https://docs.gitlab.com/ce/user/project/pipelines/settings.html).
-
-The JSON output is placed in a file named ```out-path/exec-filename/coverage.json```.
diff --git a/kcov-38/doc/jenkins.md b/kcov-38/doc/jenkins.md
deleted file mode 100644
index 3babae72d1d5..000000000000
--- a/kcov-38/doc/jenkins.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Integration with Jenkins
-------------------------
-Kcov also outputs data in the Cobertura XML format, which allows integrating kcov
-output in Jenkins (see http://cobertura.sf.net and http://jenkins-ci.org).
-
-The Cobertura output is placed in a file named ```out-path/exec-filename/cobertura.xml```
diff --git a/kcov-38/doc/kcov.1 b/kcov-38/doc/kcov.1
deleted file mode 100644
index 8fc0536dd060..000000000000
--- a/kcov-38/doc/kcov.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCOV 1 "November  24, 2011"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kcov \- Code coverage analysis for compiled programs and Python scripts
-.SH SYNOPSIS
-.B kcov
-.RI [ options ] " outdir executable [args-for-executable...]
-.PP
-.B kcov
-.RI --merge " outdir <path-to-coverage> [path-to-more-coverage...]
-.SH DESCRIPTION
-.PP
-This manual page documents briefly the \fBkcov\fP command. \fBkcov\fP is a
-code coverage tester for ELF binaries, Python scripts and shell scripts. It
-allows collecting code coverage information from executables without special
-compiler directives, and continuously produces output from long-running applications.
-
-See the GitHub page, https://github.com/SimonKagstrom/kcov, for more documentation.
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
-.\" respectively.
-.SH OPTIONS
-.TP
-\fB\-p\fP, \fB\-\-pid\fP=\fIPID\fP
-Trace PID instead of executing executable (passing the executable is optional
-for this case). Under this mode, coverage collection for shared libraries will not work.
-.TP
-\fB\-l\fP, \fB\-\-limits\fP=\fIlow,high\fP
-Setup limits for low/high coverage (default: 16,50).
-.TP
-\fB\-\-include\-path\fP=\fIP1\fP[\fI,P2\fP...]
-Comma-separated list of paths to include in the report.
-.TP
-\fB\-\-exclude\-path\fP=\fIP1\fP[\fI,P2\fP...]
-Comma-separated list of paths to exclude from the report.
-.TP
-\fB\-\-include\-pattern\fP=\fIP1\fP[\fI,P2\fP...]
-Comma-separated list of path patterns to include in the report.
-.TP
-\fB\-\-exclude\-pattern\fP=\fIP1\fP[\fI,P2\fP...]
-Comma-separated list of path patterns to exclude from the report.
-.TP
-\fB\-\-exclude\-line\fP=\fIP1\fP[\fI,P2\fP...]
-Comma-separated list of line patterns to exclude (mark as non-code)
-.TP
-\fB\-\-exclude\-region\fP=\fISTART:END\fP[\fI,START1:END1\fP...]
-Comma-separated list of regions of lines patterns to exclude (mark as non-code). The region begins with START and ends with END.
-.TP
-\fB\-\-collect\-only
-Only collect coverage data, don't produce HTML/Cobertura output.
-.TP
-\fB\-\-report\-only
-Only report HTML/Cobertura output, don't collect data.
-.TP
-\fB\-\-merge
-Merge the result of multiple kcov runs. Instead of a program to test, the output paths from previous runs should be given on the command line.
-.TP
-\fB\-\-coveralls\-id\fP=\fIid\fP
-Upload data to coveralls.io using secret repo_token or Travis CI service job ID \fIid\fP.
-The ID is taken as a repo_token if it's longer or equal to 32 characters.
-.SH UNCOMMON OPTIONS
-.TP
-\fB\-\-path\-strip\-level\fP=\fIN\fP
-Number of path levels to show for common paths (default: 2).
-.TP
-\fB\-\-skip\-solibs
-Skip coverage collection for shared libraries (improves performance)
-.TP
-\fB\-\-verify
-Verify that breakpoints are setup on instruction boundaries. This will slow down execution greatly, but can catch problems where the compiler generates bad DWARF data.
-.TP
-\fB\-\-exit\-first\-process
-exit when the first process exits, i.e., honor the behavior of daemons. The default behavior
-is to return to the console when the last process exits.
-.TP
-\fB\-\-python\-parser\fP=\fIPARSER\fP
-Set the python parser to use for Python programs (the default is python). Can be used to
-run with Python 3 on systems where Python 2 is the default.
-.TP
-\fB\-\-bash\-parser\fP=\fIPARSER\fP
-Set the bash parser to use for shell scripts (the default is /bin/bash).
-.TP
-\fB\-\-bash\-method\fP=\fIMETHOD\fP
-Use collection method \fIMETHOD\fP for bash scripts. The method can be either PS4, for use of
-the PS4 environment variable, or DEBUG for use of the DEBUG trap.
-.TP
-\fB\-\-bash\-handle\-sh\-invocation
-Handle invocations of /bin/sh scripts via using a LD_PRELOADed library that replaces execve (i.e., /bin/sh is
-executed as /bin/bash). Does not work well on some systems, so the default is not to use this.
-.TP
-\fB\-\-bash\-dont\-parse\-binary\-dir
-Kcov parses the directory of the binary for other scripts and add these to the report. If you don't
-want this behavior, this option turns that off.
-.TP
-\fB\-\-bash\-parse\-files\-in\-dir\fP=\fIP1\fP[\fI,P2\fP...]
-Parse directories for bash scripts.
-.TP
-\fB\-\-replace\-src\-path\fP=\fIP1\fP:\fIP2\fP
-Replace source file path P1 with P2, if found.
-.TP
-\fB\-\-system\-record
-Perform full-system instrumentation on a sysroot, outputting patched binaries which collect coverage data. See doc/full-system-instrumentation.md
-for more information on full-system instrumentation.
-.TP
-\fB\-\-system\-report
-Produce coverage output for a full-system coverage run.
-.RE
-.SH EXAMPLES
-.PP
-Check coverage for ./frodo and generate HTML output in /tmp/kcov and cobertura output in /tmp/kcov/frodo/cobertura.xml
-.PP
-.RS
-kcov /tmp/kcov ./frodo
-.RE
-.PP
-Check coverage for ./frodo but only include source files names with the string src/frodo
-.PP
-.RS
-kcov \-\-include\-pattern=src/frodo /tmp/kcov ./frodo
-.RE
-.PP
-Same as above but split collecting and reporting (perhaps on two different computers)
-.PP
-.RS
-kcov --collect-only /tmp/kcov ./frodo
-.PP
-kcov --report-only \-\-include\-pattern=src/frodo /tmp/kcov ./frodo
-.RE
-.SH HTML OUTPUT
-.PP
-The HTML output shows executed and non-executed lines of the source code. Some
-lines can map to multiple instrumentation points, for example for inlined functions
-(where every inlining of them will generate a separate instrumentation point).
-This is shown in the left column as 1/3 for example, which means that one of the
-three instrumentation points has been executed.
-.PP
-A special output link is [merged], which shows the union of all covered programs.
-This can be useful for example when you have unit tests in multiple binaries which
-share a subset of source files.
-.SH COBERTURA OUTPUT
-.PP
-Kcov also outputs data in the Cobertura XML format, which allows integrating kcov
-output in Jenkins (see http://cobertura.sf.net and http://jenkins-ci.org).
-.PP
-The Cobertura output is placed in a file named out-path/exec-filename/cobertura.xml.
-.SH JSON OUTPUT
-.PP
-Kcov generates a very generic json file which includes the overall percent covered
-for a single command and the count of lines instrumented and covered. It also includes
-a summary of each source file with a percentage and line counts. This allows easy
-integration with GitlabCI (see
-https://docs.gitlab.com/ce/user/project/pipelines/settings.html).
-.PP
-The JSON output is placed in a file named out-path/exec-filename/coverage.json.
-.SH AUTHOR
-.PP
-Kcov was written by Simon Kagstrom, building upon bcov by Thomas Neumann.
-.PP
-This manual page was written by Michael Tautschnig <mt@debian.org>,
-for the Debian project (but may be used by others).
diff --git a/kcov-38/doc/sonarqube.md b/kcov-38/doc/sonarqube.md
deleted file mode 100644
index e7facfa2de18..000000000000
--- a/kcov-38/doc/sonarqube.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Sonarqube integration
----------------------
-Point the generic code coverage plugin to `/path/to/kcov-output/sonarqube.xml`.
-
-Someone with better knowledge about sonarqube should probably fill this in!
\ No newline at end of file
diff --git a/kcov-38/external/lldb/include/lldb/API/LLDB.h b/kcov-38/external/lldb/include/lldb/API/LLDB.h
deleted file mode 100644
index 66e095395f13..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/LLDB.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===-- LLDB.h --------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_LLDB_h_
-#define LLDB_LLDB_h_
-
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-#include "lldb/API/SBBlock.h"
-#include "lldb/API/SBBreakpoint.h"
-#include "lldb/API/SBBreakpointLocation.h"
-#include "lldb/API/SBBroadcaster.h"
-#include "lldb/API/SBCommandInterpreter.h"
-#include "lldb/API/SBCommandReturnObject.h"
-#include "lldb/API/SBCommunication.h"
-#include "lldb/API/SBCompileUnit.h"
-#include "lldb/API/SBData.h"
-#include "lldb/API/SBDebugger.h"
-#include "lldb/API/SBDeclaration.h"
-#include "lldb/API/SBError.h"
-#include "lldb/API/SBEvent.h"
-#include "lldb/API/SBExecutionContext.h"
-#include "lldb/API/SBFileSpec.h"
-#include "lldb/API/SBFrame.h"
-#include "lldb/API/SBFunction.h"
-#include "lldb/API/SBHostOS.h"
-#include "lldb/API/SBInstruction.h"
-#include "lldb/API/SBInstructionList.h"
-#include "lldb/API/SBLineEntry.h"
-#include "lldb/API/SBListener.h"
-#include "lldb/API/SBModule.h"
-#include "lldb/API/SBProcess.h"
-#include "lldb/API/SBQueue.h"
-#include "lldb/API/SBQueueItem.h"
-#include "lldb/API/SBSourceManager.h"
-#include "lldb/API/SBStream.h"
-#include "lldb/API/SBStringList.h"
-#include "lldb/API/SBSymbol.h"
-#include "lldb/API/SBSymbolContext.h"
-#include "lldb/API/SBTarget.h"
-#include "lldb/API/SBThread.h"
-#include "lldb/API/SBType.h"
-#include "lldb/API/SBValue.h"
-#include "lldb/API/SBValueList.h"
-#include "lldb/API/SBVariablesOptions.h"
-
-#endif  // LLDB_LLDB_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBAddress.h b/kcov-38/external/lldb/include/lldb/API/SBAddress.h
deleted file mode 100644
index 4cbbee9fd132..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBAddress.h
+++ /dev/null
@@ -1,152 +0,0 @@
-//===-- SBAddress.h ---------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBAddress_h_
-#define LLDB_SBAddress_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBModule.h"
-
-namespace lldb {
-
-class LLDB_API SBAddress
-{
-public:
-
-    SBAddress ();
-
-    SBAddress (const lldb::SBAddress &rhs);
-
-    SBAddress (lldb::SBSection section, lldb::addr_t offset);
-
-    // Create an address by resolving a load address using the supplied target
-    SBAddress (lldb::addr_t load_addr, lldb::SBTarget &target);
-
-    ~SBAddress ();
-
-    const lldb::SBAddress &
-    operator = (const lldb::SBAddress &rhs);
-
-    bool
-    IsValid () const;
-
-    void
-    Clear ();
-
-    addr_t
-    GetFileAddress () const;
-
-    addr_t
-    GetLoadAddress (const lldb::SBTarget &target) const;
-
-    void
-    SetAddress (lldb::SBSection section, lldb::addr_t offset);
-
-    void
-    SetLoadAddress (lldb::addr_t load_addr, 
-                    lldb::SBTarget &target);
-    bool
-    OffsetAddress (addr_t offset);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    // The following queries can lookup symbol information for a given address.
-    // An address might refer to code or data from an existing module, or it
-    // might refer to something on the stack or heap. The following functions
-    // will only return valid values if the address has been resolved to a code
-    // or data address using "void SBAddress::SetLoadAddress(...)" or 
-    // "lldb::SBAddress SBTarget::ResolveLoadAddress (...)". 
-    lldb::SBSymbolContext
-    GetSymbolContext (uint32_t resolve_scope);
-
-    
-    // The following functions grab individual objects for a given address and
-    // are less efficient if you want more than one symbol related objects. 
-    // Use one of the following when you want multiple debug symbol related 
-    // objects for an address:
-    //    lldb::SBSymbolContext SBAddress::GetSymbolContext (uint32_t resolve_scope);
-    //    lldb::SBSymbolContext SBTarget::ResolveSymbolContextForAddress (const SBAddress &addr, uint32_t resolve_scope);
-    // One or more bits from the SymbolContextItem enumerations can be logically
-    // OR'ed together to more efficiently retrieve multiple symbol objects.
-
-    lldb::SBSection
-    GetSection ();
-
-    lldb::addr_t
-    GetOffset ();
-
-    lldb::SBModule
-    GetModule ();
-    
-    lldb::SBCompileUnit
-    GetCompileUnit ();
-
-    lldb::SBFunction
-    GetFunction ();
-
-    lldb::SBBlock
-    GetBlock ();
-
-    lldb::SBSymbol
-    GetSymbol ();
-
-    lldb::SBLineEntry
-    GetLineEntry ();
-    
-    lldb::AddressClass
-    GetAddressClass ();
-
-protected:
-
-    friend class SBBlock;
-    friend class SBBreakpointLocation;
-    friend class SBFrame;
-    friend class SBFunction;
-    friend class SBLineEntry;
-    friend class SBInstruction;
-    friend class SBModule;
-    friend class SBSection;
-    friend class SBSymbol;
-    friend class SBSymbolContext;
-    friend class SBTarget;
-    friend class SBThread;
-    friend class SBThreadPlan;
-    friend class SBValue;
-    friend class SBQueueItem;
-
-    lldb_private::Address *
-    operator->();
-
-    const lldb_private::Address *
-    operator->() const;
-
-    lldb_private::Address *
-    get ();
-
-    lldb_private::Address &
-    ref();
-
-    const lldb_private::Address &
-    ref() const;
-
-    SBAddress (const lldb_private::Address *lldb_object_ptr);
-
-    void
-    SetAddress (const lldb_private::Address *lldb_object_ptr);
-
-private:
-
-    std::unique_ptr<lldb_private::Address> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBAddress_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h b/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
deleted file mode 100644
index 712150e128be..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBAttachInfo.h
+++ /dev/null
@@ -1,149 +0,0 @@
-//===-- SBAttachInfo.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBAttachInfo_h_
-#define LLDB_SBAttachInfo_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class SBTarget;
-
-class LLDB_API SBAttachInfo
-{
-public:
-    SBAttachInfo ();
-
-    SBAttachInfo (lldb::pid_t pid);
-
-    SBAttachInfo (const char *path, bool wait_for);
-
-    SBAttachInfo (const SBAttachInfo &rhs);
-
-    ~SBAttachInfo();
-
-    SBAttachInfo &
-    operator = (const SBAttachInfo &rhs);
-
-    lldb::pid_t
-    GetProcessID ();
-
-    void
-    SetProcessID (lldb::pid_t pid);
-
-    void
-    SetExecutable (const char *path);
-
-    void
-    SetExecutable (lldb::SBFileSpec exe_file);
-
-    bool
-    GetWaitForLaunch ();
-
-    void
-    SetWaitForLaunch (bool b);
-
-    bool
-    GetIgnoreExisting ();
-
-    void
-    SetIgnoreExisting (bool b);
-
-    uint32_t
-    GetResumeCount ();
-
-    void
-    SetResumeCount (uint32_t c);
-
-    const char *
-    GetProcessPluginName ();
-
-    void
-    SetProcessPluginName (const char *plugin_name);
-
-    uint32_t
-    GetUserID();
-
-    uint32_t
-    GetGroupID();
-
-    bool
-    UserIDIsValid ();
-
-    bool
-    GroupIDIsValid ();
-
-    void
-    SetUserID (uint32_t uid);
-
-    void
-    SetGroupID (uint32_t gid);
-
-    uint32_t
-    GetEffectiveUserID();
-
-    uint32_t
-    GetEffectiveGroupID();
-
-    bool
-    EffectiveUserIDIsValid ();
-
-    bool
-    EffectiveGroupIDIsValid ();
-
-    void
-    SetEffectiveUserID (uint32_t uid);
-
-    void
-    SetEffectiveGroupID (uint32_t gid);
-
-    lldb::pid_t
-    GetParentProcessID ();
-
-    void
-    SetParentProcessID (lldb::pid_t pid);
-
-    bool
-    ParentProcessIDIsValid();
-
-    //----------------------------------------------------------------------
-    /// Get the listener that will be used to receive process events.
-    ///
-    /// If no listener has been set via a call to
-    /// SBLaunchInfo::SetListener(), then an invalid SBListener will be
-    /// returned (SBListener::IsValid() will return false). If a listener
-    /// has been set, then the valid listener object will be returned.
-    //----------------------------------------------------------------------
-    SBListener
-    GetListener ();
-
-    //----------------------------------------------------------------------
-    /// Set the listener that will be used to receive process events.
-    ///
-    /// By default the SBDebugger, which has a listener, that the SBTarget
-    /// belongs to will listen for the process events. Calling this function
-    /// allows a different listener to be used to listen for process events.
-    //----------------------------------------------------------------------
-    void
-    SetListener (SBListener &listener);
-
-
-protected:
-    friend class SBTarget;
-
-    lldb_private::ProcessAttachInfo &
-    ref ();
-
-    ProcessAttachInfoSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBAttachInfo_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBlock.h b/kcov-38/external/lldb/include/lldb/API/SBBlock.h
deleted file mode 100644
index a18eab02088b..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBBlock.h
+++ /dev/null
@@ -1,123 +0,0 @@
-//===-- SBBlock.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBBlock_h_
-#define LLDB_SBBlock_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBFrame.h"
-#include "lldb/API/SBTarget.h"
-#include "lldb/API/SBValueList.h"
-
-namespace lldb {
-
-class LLDB_API SBBlock
-{
-public:
-
-    SBBlock ();
-
-    SBBlock (const lldb::SBBlock &rhs);
-
-    ~SBBlock ();
-
-    const lldb::SBBlock &
-    operator = (const lldb::SBBlock &rhs);
-
-    bool
-    IsInlined () const;
-
-    bool
-    IsValid () const;
-
-    const char *
-    GetInlinedName () const;
-
-    lldb::SBFileSpec
-    GetInlinedCallSiteFile () const;
-
-    uint32_t 
-    GetInlinedCallSiteLine () const;
-
-    uint32_t
-    GetInlinedCallSiteColumn () const;
-
-    lldb::SBBlock
-    GetParent ();
-    
-    lldb::SBBlock
-    GetSibling ();
-    
-    lldb::SBBlock
-    GetFirstChild ();
-
-    uint32_t
-    GetNumRanges ();
-
-    lldb::SBAddress
-    GetRangeStartAddress (uint32_t idx);
-
-    lldb::SBAddress
-    GetRangeEndAddress (uint32_t idx);
-
-    uint32_t
-    GetRangeIndexForBlockAddress (lldb::SBAddress block_addr);
-
-    lldb::SBValueList
-    GetVariables (lldb::SBFrame& frame,
-                  bool arguments,
-                  bool locals,
-                  bool statics,
-                  lldb::DynamicValueType use_dynamic);
-    
-    lldb::SBValueList
-    GetVariables (lldb::SBTarget& target,
-                  bool arguments,
-                  bool locals,
-                  bool statics);
-    //------------------------------------------------------------------
-    /// Get the inlined block that contains this block.
-    ///
-    /// @return
-    ///     If this block is inlined, it will return this block, else 
-    ///     parent blocks will be searched to see if any contain this 
-    ///     block and are themselves inlined. An invalid SBBlock will 
-    ///     be returned if this block nor any parent blocks are inlined
-    ///     function blocks.
-    //------------------------------------------------------------------
-    lldb::SBBlock
-    GetContainingInlinedBlock ();
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-private:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBFunction;
-    friend class SBSymbolContext;
-
-    lldb_private::Block *
-    GetPtr ();
-
-    void
-    SetPtr (lldb_private::Block *lldb_object_ptr);
-
-    SBBlock (lldb_private::Block *lldb_object_ptr);
-
-    void
-    AppendVariables (bool can_create, bool get_parent_variables, lldb_private::VariableList *var_list);
-
-    lldb_private::Block *m_opaque_ptr;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBBlock_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h b/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
deleted file mode 100644
index c244ab8a9b48..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBBreakpoint.h
+++ /dev/null
@@ -1,193 +0,0 @@
-//===-- SBBreakpoint.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBBreakpoint_h_
-#define LLDB_SBBreakpoint_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBBreakpoint
-{
-public:
-
-    typedef bool (*BreakpointHitCallback) (void *baton, 
-                                           SBProcess &process,
-                                           SBThread &thread, 
-                                           lldb::SBBreakpointLocation &location);
-
-    SBBreakpoint ();
-
-    SBBreakpoint (const lldb::SBBreakpoint& rhs);
-
-    ~SBBreakpoint();
-
-    const lldb::SBBreakpoint &
-    operator = (const lldb::SBBreakpoint& rhs);
-    
-    // Tests to see if the opaque breakpoint object in this object matches the
-    // opaque breakpoint object in "rhs".
-    bool
-    operator == (const lldb::SBBreakpoint& rhs);
-
-    bool
-    operator != (const lldb::SBBreakpoint& rhs);
-    
-    break_id_t
-    GetID () const;
-
-    bool
-    IsValid() const;
-
-    void
-    ClearAllBreakpointSites ();
-
-    lldb::SBBreakpointLocation
-    FindLocationByAddress (lldb::addr_t vm_addr);
-
-    lldb::break_id_t
-    FindLocationIDByAddress (lldb::addr_t vm_addr);
-
-    lldb::SBBreakpointLocation
-    FindLocationByID (lldb::break_id_t bp_loc_id);
-
-    lldb::SBBreakpointLocation
-    GetLocationAtIndex (uint32_t index);
-
-    void
-    SetEnabled (bool enable);
-
-    bool
-    IsEnabled ();
-    
-    void
-    SetOneShot (bool one_shot);
-
-    bool
-    IsOneShot () const;
-    
-    bool
-    IsInternal ();
-
-    uint32_t
-    GetHitCount () const;
-
-    void
-    SetIgnoreCount (uint32_t count);
-
-    uint32_t
-    GetIgnoreCount () const;
-    
-    void 
-    SetCondition (const char *condition);
-    
-    const char *
-    GetCondition ();
-
-    void
-    SetThreadID (lldb::tid_t sb_thread_id);
-
-    lldb::tid_t
-    GetThreadID ();
-    
-    void
-    SetThreadIndex (uint32_t index);
-    
-    uint32_t
-    GetThreadIndex() const;
-    
-    void
-    SetThreadName (const char *thread_name);
-    
-    const char *
-    GetThreadName () const;
-    
-    void 
-    SetQueueName (const char *queue_name);
-    
-    const char *
-    GetQueueName () const;
-
-    void
-    SetCallback (BreakpointHitCallback callback, void *baton);
-    
-    void
-    SetScriptCallbackFunction (const char *callback_function_name);
-    
-    SBError
-    SetScriptCallbackBody (const char *script_body_text);
-
-    bool
-    AddName (const char *new_name);
-
-    void
-    RemoveName (const char *name_to_remove);
-
-    bool
-    MatchesName (const char *name);
-
-    void
-    GetNames (SBStringList &names);
-    
-    size_t
-    GetNumResolvedLocations() const;
-
-    size_t
-    GetNumLocations() const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    static bool
-    EventIsBreakpointEvent (const lldb::SBEvent &event);
-    
-    static lldb::BreakpointEventType
-    GetBreakpointEventTypeFromEvent (const lldb::SBEvent& event);
-
-    static lldb::SBBreakpoint
-    GetBreakpointFromEvent (const lldb::SBEvent& event);
-    
-    static lldb::SBBreakpointLocation
-    GetBreakpointLocationAtIndexFromEvent (const lldb::SBEvent& event, uint32_t loc_idx);
-    
-    static uint32_t
-    GetNumBreakpointLocationsFromEvent (const lldb::SBEvent &event_sp);
-
-
-private:
-    friend class SBBreakpointLocation;
-    friend class SBTarget;
-
-    SBBreakpoint (const lldb::BreakpointSP &bp_sp);
-
-    lldb_private::Breakpoint *
-    operator->() const;
-
-    lldb_private::Breakpoint *
-    get() const;
-
-    lldb::BreakpointSP &
-    operator *();
-
-    const lldb::BreakpointSP &
-    operator *() const;
-
-    static bool
-    PrivateBreakpointHitCallback (void *baton, 
-                                  lldb_private::StoppointCallbackContext *context, 
-                                  lldb::user_id_t break_id, 
-                                  lldb::user_id_t break_loc_id);
-    
-    lldb::BreakpointSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBBreakpoint_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h b/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
deleted file mode 100644
index ab7049739c0b..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBBreakpointLocation.h
+++ /dev/null
@@ -1,114 +0,0 @@
-//===-- SBBreakpointLocation.h ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBBreakpointLocation_h_
-#define LLDB_SBBreakpointLocation_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBBreakpoint.h"
-
-namespace lldb {
-
-class LLDB_API SBBreakpointLocation
-{
-public:
-
-    SBBreakpointLocation ();
-
-    SBBreakpointLocation (const lldb::SBBreakpointLocation &rhs);
-
-    ~SBBreakpointLocation ();
-
-    const lldb::SBBreakpointLocation &
-    operator = (const lldb::SBBreakpointLocation &rhs);
-
-    break_id_t
-    GetID ();
-    
-    bool
-    IsValid() const;
-
-    lldb::SBAddress
-    GetAddress ();
-    
-    lldb::addr_t
-    GetLoadAddress ();
-
-    void
-    SetEnabled(bool enabled);
-
-    bool
-    IsEnabled ();
-
-    uint32_t
-    GetIgnoreCount ();
-
-    void
-    SetIgnoreCount (uint32_t n);
-
-    void 
-    SetCondition (const char *condition);
-    
-    const char *
-    GetCondition ();
-
-    void
-    SetScriptCallbackFunction (const char *callback_function_name);
-
-    SBError
-    SetScriptCallbackBody (const char *script_body_text);
-    
-    void
-    SetThreadID (lldb::tid_t sb_thread_id);
-
-    lldb::tid_t
-    GetThreadID ();
-    
-    void
-    SetThreadIndex (uint32_t index);
-    
-    uint32_t
-    GetThreadIndex() const;
-    
-    void
-    SetThreadName (const char *thread_name);
-    
-    const char *
-    GetThreadName () const;
-    
-    void 
-    SetQueueName (const char *queue_name);
-    
-    const char *
-    GetQueueName () const;
-
-    bool
-    IsResolved ();
-
-    bool
-    GetDescription (lldb::SBStream &description, DescriptionLevel level);
-
-    SBBreakpoint
-    GetBreakpoint ();
-
-    SBBreakpointLocation (const lldb::BreakpointLocationSP &break_loc_sp);
-
-private:
-    friend class SBBreakpoint;
-
-    void
-    SetLocation (const lldb::BreakpointLocationSP &break_loc_sp);
-
-    lldb::BreakpointLocationSP m_opaque_sp;
-
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBBreakpointLocation_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h b/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
deleted file mode 100644
index 28b6686b79b3..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBBroadcaster.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//===-- SBBroadcaster.h -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBBroadcaster_h_
-#define LLDB_SBBroadcaster_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBBroadcaster
-{
-public:
-    SBBroadcaster ();
-
-    SBBroadcaster (const char *name);
-
-    SBBroadcaster (const SBBroadcaster &rhs);
-    
-    const SBBroadcaster &
-    operator = (const SBBroadcaster &rhs);
-
-    ~SBBroadcaster();
-
-    bool
-    IsValid () const;
-
-    void
-    Clear ();
-
-    void
-    BroadcastEventByType (uint32_t event_type, bool unique = false);
-
-    void
-    BroadcastEvent (const lldb::SBEvent &event, bool unique = false);
-
-    void
-    AddInitialEventsToListener (const lldb::SBListener &listener, uint32_t requested_events);
-
-    uint32_t
-    AddListener (const lldb::SBListener &listener, uint32_t event_mask);
-
-    const char *
-    GetName () const;
-
-    bool
-    EventTypeHasListeners (uint32_t event_type);
-
-    bool
-    RemoveListener (const lldb::SBListener &listener, uint32_t event_mask = UINT32_MAX);
-
-    // This comparison is checking if the internal opaque pointer value
-    // is equal to that in "rhs".
-    bool
-    operator == (const lldb::SBBroadcaster &rhs) const;
-
-    // This comparison is checking if the internal opaque pointer value
-    // is not equal to that in "rhs".
-    bool
-    operator != (const lldb::SBBroadcaster &rhs) const;
-
-    // This comparison is checking if the internal opaque pointer value
-    // is less than that in "rhs" so SBBroadcaster objects can be contained
-    // in ordered containers.
-    bool
-    operator < (const lldb::SBBroadcaster &rhs) const;
-
-protected:
-    friend class SBCommandInterpreter;
-    friend class SBCommunication;
-    friend class SBEvent;
-    friend class SBListener;
-    friend class SBProcess;
-    friend class SBTarget;
-
-    SBBroadcaster (lldb_private::Broadcaster *broadcaster, bool owns);
-
-    lldb_private::Broadcaster *
-    get () const;
-
-    void
-    reset (lldb_private::Broadcaster *broadcaster, bool owns);
-
-private:
-    lldb::BroadcasterSP m_opaque_sp;
-    lldb_private::Broadcaster *m_opaque_ptr;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBBroadcaster_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h b/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
deleted file mode 100644
index 235a2f3ea603..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBCommandInterpreter.h
+++ /dev/null
@@ -1,318 +0,0 @@
-//===-- SBCommandInterpreter.h ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBCommandInterpreter_h_
-#define LLDB_SBCommandInterpreter_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBDebugger.h"
-
-namespace lldb {
-
-class LLDB_API SBCommandInterpreterRunOptions
-{
-friend class SBDebugger;
-friend class SBCommandInterpreter;
-
-public:
-    SBCommandInterpreterRunOptions();
-    ~SBCommandInterpreterRunOptions();
-
-    bool
-    GetStopOnContinue () const;
-
-    void
-    SetStopOnContinue (bool);
-
-    bool
-    GetStopOnError () const;
-
-    void
-    SetStopOnError (bool);
-
-    bool
-    GetStopOnCrash () const;
-
-    void
-    SetStopOnCrash (bool);
-
-    bool
-    GetEchoCommands () const;
-
-    void
-    SetEchoCommands (bool);
-
-    bool
-    GetPrintResults () const;
-
-    void
-    SetPrintResults (bool);
-
-    bool
-    GetAddToHistory () const;
-
-    void
-    SetAddToHistory (bool);
-private:
-    lldb_private::CommandInterpreterRunOptions *
-    get () const;
-
-    lldb_private::CommandInterpreterRunOptions &
-    ref () const;
-
-    // This is set in the constructor and will always be valid.
-    mutable std::unique_ptr<lldb_private::CommandInterpreterRunOptions> m_opaque_up;
-};
-
-class SBCommandInterpreter
-{
-public:
-    enum
-    {
-        eBroadcastBitThreadShouldExit       = (1 << 0),
-        eBroadcastBitResetPrompt            = (1 << 1),
-        eBroadcastBitQuitCommandReceived    = (1 << 2),           // User entered quit 
-        eBroadcastBitAsynchronousOutputData = (1 << 3),
-        eBroadcastBitAsynchronousErrorData  = (1 << 4)
-    };
-
-    SBCommandInterpreter (const lldb::SBCommandInterpreter &rhs);
-    
-    const lldb::SBCommandInterpreter &
-    operator = (const lldb::SBCommandInterpreter &rhs);
-
-    ~SBCommandInterpreter ();
-
-    static const char * 
-    GetArgumentTypeAsCString (const lldb::CommandArgumentType arg_type);
-    
-    static const char *
-    GetArgumentDescriptionAsCString (const lldb::CommandArgumentType arg_type);
-
-    static bool
-    EventIsCommandInterpreterEvent (const lldb::SBEvent &event);
-    
-    bool
-    IsValid() const;
-
-    bool
-    CommandExists (const char *cmd);
-
-    bool
-    AliasExists (const char *cmd);
-
-    lldb::SBBroadcaster
-    GetBroadcaster ();
-    
-    static const char *
-    GetBroadcasterClass ();
-
-    bool
-    HasCommands ();
-
-    bool
-    HasAliases ();
-
-    bool
-    HasAliasOptions ();
-
-    lldb::SBProcess
-    GetProcess ();
-    
-    lldb::SBDebugger
-    GetDebugger ();
-    
-    lldb::SBCommand
-    AddMultiwordCommand (const char* name, const char* help);
-    
-    lldb::SBCommand
-    AddCommand (const char* name, lldb::SBCommandPluginInterface *impl, const char* help);
-
-    void
-    SourceInitFileInHomeDirectory (lldb::SBCommandReturnObject &result);
-
-    void
-    SourceInitFileInCurrentWorkingDirectory (lldb::SBCommandReturnObject &result);
-
-    lldb::ReturnStatus
-    HandleCommand (const char *command_line, lldb::SBCommandReturnObject &result, bool add_to_history = false);
-
-    lldb::ReturnStatus
-    HandleCommand (const char *command_line, SBExecutionContext &exe_ctx, SBCommandReturnObject &result, bool add_to_history = false);
-
-    void
-    HandleCommandsFromFile (lldb::SBFileSpec &file,
-                            lldb::SBExecutionContext &override_context,
-                            lldb::SBCommandInterpreterRunOptions &options,
-                            lldb::SBCommandReturnObject result);
-
-    // The pointer based interface is not useful in SWIG, since the cursor & last_char arguments are string pointers INTO current_line
-    // and you can't do that in a scripting language interface in general...
-    
-    // In either case, the way this works is that the you give it a line and cursor position in the line.  The function
-    // will return the number of completions.  The matches list will contain number_of_completions + 1 elements.  The first
-    // element is the common substring after the cursor position for all the matches.  The rest of the elements are the
-    // matches.  The first element is useful if you are emulating the common shell behavior where the tab completes
-    // to the string that is common among all the matches, then you should first check if the first element is non-empty,
-    // and if so just insert it and move the cursor to the end of the insertion.  The next tab will return an empty
-    // common substring, and a list of choices (if any), at which point you should display the choices and let the user
-    // type further to disambiguate.
-    
-    int
-    HandleCompletion (const char *current_line,
-                      const char *cursor,
-                      const char *last_char,
-                      int match_start_point,
-                      int max_return_elements,
-                      lldb::SBStringList &matches);
-
-    int
-    HandleCompletion (const char *current_line,
-                      uint32_t cursor_pos,
-                      int match_start_point,
-                      int max_return_elements,
-                      lldb::SBStringList &matches);
-
-    // Catch commands before they execute by registering a callback that will
-    // get called when the command gets executed. This allows GUI or command
-    // line interfaces to intercept a command and stop it from happening
-    bool
-    SetCommandOverrideCallback (const char *command_name,
-                                lldb::CommandOverrideCallback callback,
-                                void *baton);
-    
-    SBCommandInterpreter (lldb_private::CommandInterpreter *interpreter_ptr = NULL);   // Access using SBDebugger::GetCommandInterpreter();
-    
-    //----------------------------------------------------------------------
-    /// Return true if the command interpreter is the active IO handler.
-    ///
-    /// This indicates that any input coming into the debugger handles will
-    /// go to the command interpreter and will result in LLDB command line
-    /// commands being executed.
-    //----------------------------------------------------------------------
-    bool
-    IsActive ();
-    
-    //----------------------------------------------------------------------
-    /// Get the string that needs to be written to the debugger stdin file
-    /// handle when a control character is typed.
-    ///
-    /// Some GUI programs will intercept "control + char" sequences and want
-    /// to have them do what normally would happen when using a real
-    /// terminal, so this function allows GUI programs to emulate this
-    /// functionality.
-    ///
-    /// @param[in] ch
-    ///     The character that was typed along with the control key
-    ///
-    /// @return
-    ///     The string that should be written into the file handle that is
-    ///     feeding the input stream for the debugger, or NULL if there is
-    ///     no string for this control key.
-    //----------------------------------------------------------------------
-    const char *
-    GetIOHandlerControlSequence(char ch);
-
-    bool
-    GetPromptOnQuit();
-
-    void
-    SetPromptOnQuit(bool b);
-
-    //----------------------------------------------------------------------
-    /// Resolve the command just as HandleCommand would, expanding abbreviations
-    /// and aliases.  If successful, result->GetOutput has the full expansion.
-    //----------------------------------------------------------------------
-    void
-    ResolveCommand(const char *command_line, SBCommandReturnObject &result);
-
-protected:
-
-    lldb_private::CommandInterpreter &
-    ref ();
-
-    lldb_private::CommandInterpreter *
-    get ();
-
-    void
-    reset (lldb_private::CommandInterpreter *);
-private:
-    friend class SBDebugger;
-
-    static void
-    InitializeSWIG ();
-
-    lldb_private::CommandInterpreter *m_opaque_ptr;
-};
-
-class SBCommandPluginInterface
-{
-public:
-    virtual bool
-    DoExecute (lldb::SBDebugger /*debugger*/,
-               char** /*command*/,
-               lldb::SBCommandReturnObject & /*result*/)
-    {
-        return false;
-    }
-    
-    virtual
-    ~SBCommandPluginInterface ()
-    {}
-};
-    
-class SBCommand
-{
-public:
-    
-    SBCommand ();
-    
-    bool
-    IsValid ();
-    
-    const char*
-    GetName ();
-    
-    const char*
-    GetHelp ();
-    
-    const char*
-    GetHelpLong ();
-    
-    void
-    SetHelp (const char*);
-    
-    void
-    SetHelpLong (const char*);
-    
-    uint32_t
-    GetFlags ();
-    
-    void
-    SetFlags (uint32_t flags);
-    
-    lldb::SBCommand
-    AddMultiwordCommand (const char* name, const char* help = NULL);
-    
-    lldb::SBCommand
-    AddCommand (const char* name, lldb::SBCommandPluginInterface* impl, const char* help = NULL);
-    
-private:
-    
-    friend class SBDebugger;
-    friend class SBCommandInterpreter;
-    
-    SBCommand (lldb::CommandObjectSP cmd_sp);
-    
-    lldb::CommandObjectSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBCommandInterpreter_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h b/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
deleted file mode 100644
index c51d6bc8d2d5..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBCommandReturnObject.h
+++ /dev/null
@@ -1,133 +0,0 @@
-//===-- SBCommandReturnObject.h ---------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBCommandReturnObject_h_
-#define LLDB_SBCommandReturnObject_h_
-
-#include <stdio.h>
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBCommandReturnObject
-{
-public:
-
-    SBCommandReturnObject ();
-
-    SBCommandReturnObject (const lldb::SBCommandReturnObject &rhs);
-
-    const lldb::SBCommandReturnObject &
-    operator = (const lldb::SBCommandReturnObject &rhs);
-    
-
-    SBCommandReturnObject (lldb_private::CommandReturnObject *ptr);
-    
-    lldb_private::CommandReturnObject *
-    Release ();
-
-    ~SBCommandReturnObject ();
-
-    bool
-    IsValid() const;
-
-    const char *
-    GetOutput ();
-
-    const char *
-    GetError ();
-
-    size_t
-    PutOutput (FILE *fh);
-
-    size_t
-    GetOutputSize ();
-
-    size_t
-    GetErrorSize ();
-
-    size_t
-    PutError (FILE *fh);
-
-    void
-    Clear();
-
-    lldb::ReturnStatus
-    GetStatus();
-    
-    void
-    SetStatus (lldb::ReturnStatus status);
-
-    bool
-    Succeeded ();
-
-    bool
-    HasResult ();
-
-    void
-    AppendMessage (const char *message);
-
-    void
-    AppendWarning (const char *message);
-    
-    bool
-    GetDescription (lldb::SBStream &description);
-    
-    void
-    SetImmediateOutputFile (FILE *fh);
-    
-    void
-    SetImmediateErrorFile (FILE *fh);
-    
-    void
-    PutCString(const char* string, int len = -1);
-    
-    size_t
-    Printf(const char* format, ...)  __attribute__ ((format (printf, 2, 3)));
-    
-    const char *
-    GetOutput (bool only_if_no_immediate);
-    
-    const char *
-    GetError (bool only_if_no_immediate);
-    
-    void
-    SetError (lldb::SBError &error,
-              const char *fallback_error_cstr = NULL);
-    
-    void
-    SetError (const char* error_cstr);
-    
-protected:
-    friend class SBCommandInterpreter;
-    friend class SBOptions;
-
-    lldb_private::CommandReturnObject *
-    operator->() const;
-
-    lldb_private::CommandReturnObject *
-    get() const;
-
-    lldb_private::CommandReturnObject &
-    operator*() const;
-
-    lldb_private::CommandReturnObject &
-    ref() const;
-
-    void
-    SetLLDBObjectPtr (lldb_private::CommandReturnObject *ptr);
-
- private:
-    std::unique_ptr<lldb_private::CommandReturnObject> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif        // LLDB_SBCommandReturnObject_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCommunication.h b/kcov-38/external/lldb/include/lldb/API/SBCommunication.h
deleted file mode 100644
index c4b2709de8ab..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBCommunication.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//===-- SBCommunication.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBCommunication_h_
-#define LLDB_SBCommunication_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBError.h"
-
-namespace lldb {
-
-class LLDB_API SBCommunication
-{
-public:
-    FLAGS_ANONYMOUS_ENUM()
-    {
-        eBroadcastBitDisconnected           = (1 << 0), ///< Sent when the communications connection is lost.
-        eBroadcastBitReadThreadGotBytes     = (1 << 1), ///< Sent by the read thread when bytes become available.
-        eBroadcastBitReadThreadDidExit      = (1 << 2), ///< Sent by the read thread when it exits to inform clients.
-        eBroadcastBitReadThreadShouldExit   = (1 << 3), ///< Sent by clients that need to cancel the read thread.
-        eBroadcastBitPacketAvailable        = (1 << 4), ///< Sent when data received makes a complete packet.
-        eAllEventBits                       = 0xffffffff
-    };
-
-    typedef void (*ReadThreadBytesReceived) (void *baton, const void *src, size_t src_len);
-
-    SBCommunication ();
-    SBCommunication (const char * broadcaster_name);
-   ~SBCommunication ();
-
-
-    bool
-    IsValid () const;
-
-    lldb::SBBroadcaster
-    GetBroadcaster ();
-    
-    static const char *GetBroadcasterClass();
-
-    lldb::ConnectionStatus
-    AdoptFileDesriptor (int fd, bool owns_fd);
-
-    lldb::ConnectionStatus
-    Connect (const char *url);
-
-    lldb::ConnectionStatus
-    Disconnect ();
-
-    bool
-    IsConnected () const;
-
-    bool
-    GetCloseOnEOF ();
-
-    void
-    SetCloseOnEOF (bool b);
-
-    size_t
-    Read (void *dst,
-          size_t dst_len,
-          uint32_t timeout_usec,
-          lldb::ConnectionStatus &status);
-
-    size_t
-    Write (const void *src,
-           size_t src_len,
-           lldb::ConnectionStatus &status);
-
-    bool
-    ReadThreadStart ();
-
-    bool
-    ReadThreadStop ();
-
-    bool
-    ReadThreadIsRunning ();
-
-    bool
-    SetReadThreadBytesReceivedCallback (ReadThreadBytesReceived callback,
-                                        void *callback_baton);
-
-
-private:
-
-    DISALLOW_COPY_AND_ASSIGN (SBCommunication);
-
-    lldb_private::Communication *m_opaque;
-    bool m_opaque_owned;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBCommunication_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h b/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
deleted file mode 100644
index a53d556679c4..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBCompileUnit.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//===-- SBCompileUnit.h -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBCompileUnit_h_
-#define LLDB_SBCompileUnit_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBFileSpec.h"
-
-namespace lldb {
-
-class LLDB_API SBCompileUnit
-{
-public:
-
-    SBCompileUnit ();
-
-    SBCompileUnit (const lldb::SBCompileUnit &rhs);
-
-    ~SBCompileUnit ();
-
-    const lldb::SBCompileUnit &
-    operator = (const lldb::SBCompileUnit &rhs);
-
-    bool
-    IsValid () const;
-
-    lldb::SBFileSpec
-    GetFileSpec () const;
-
-    uint32_t
-    GetNumLineEntries () const;
-
-    lldb::SBLineEntry
-    GetLineEntryAtIndex (uint32_t idx) const;
-
-    uint32_t
-    FindLineEntryIndex (uint32_t start_idx,
-                        uint32_t line,
-                        lldb::SBFileSpec *inline_file_spec) const;
-
-    uint32_t
-    FindLineEntryIndex (uint32_t start_idx,
-                        uint32_t line,
-                        lldb::SBFileSpec *inline_file_spec,
-                        bool exact) const;
-
-    SBFileSpec
-    GetSupportFileAtIndex (uint32_t idx) const;
-
-    uint32_t
-    GetNumSupportFiles () const;
-
-    uint32_t
-    FindSupportFileIndex (uint32_t start_idx, const SBFileSpec &sb_file, bool full);
-    
-    //------------------------------------------------------------------
-    /// Get all types matching \a type_mask from debug info in this
-    /// compile unit.
-    ///
-    /// @param[in] type_mask
-    ///    A bitfield that consists of one or more bits logically OR'ed
-    ///    together from the lldb::TypeClass enumeration. This allows
-    ///    you to request only structure types, or only class, struct
-    ///    and union types. Passing in lldb::eTypeClassAny will return
-    ///    all types found in the debug information for this compile
-    ///    unit.
-    ///
-    /// @return
-    ///    A list of types in this compile unit that match \a type_mask
-    //------------------------------------------------------------------
-    lldb::SBTypeList
-    GetTypes (uint32_t type_mask = lldb::eTypeClassAny);
-
-    lldb::LanguageType
-    GetLanguage ();
-    
-    bool
-    operator == (const lldb::SBCompileUnit &rhs) const;
-
-    bool
-    operator != (const lldb::SBCompileUnit &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-private:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBSymbolContext;
-    friend class SBModule;
-
-    SBCompileUnit (lldb_private::CompileUnit *lldb_object_ptr);
-
-    const lldb_private::CompileUnit *
-    operator->() const;
-
-    const lldb_private::CompileUnit &
-    operator*() const;
-    
-    lldb_private::CompileUnit *
-    get ();
-    
-    void
-    reset (lldb_private::CompileUnit *lldb_object_ptr);
-
-    lldb_private::CompileUnit *m_opaque_ptr;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBCompileUnit_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBData.h b/kcov-38/external/lldb/include/lldb/API/SBData.h
deleted file mode 100644
index a2bd72fad570..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBData.h
+++ /dev/null
@@ -1,181 +0,0 @@
-//===-- SBData.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBData_h_
-#define LLDB_SBData_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBData
-{
-public:
-
-    SBData ();
-
-    SBData (const SBData &rhs);
-    
-    const SBData &
-    operator = (const SBData &rhs);
-
-    ~SBData ();
-    
-    uint8_t
-    GetAddressByteSize ();
-    
-    void
-    SetAddressByteSize (uint8_t addr_byte_size);
-    
-    void
-    Clear ();
-    
-    bool
-    IsValid();
-    
-    size_t
-    GetByteSize ();
-    
-    lldb::ByteOrder
-    GetByteOrder();
-    
-    void
-    SetByteOrder (lldb::ByteOrder endian);
-    
-    float
-    GetFloat (lldb::SBError& error, lldb::offset_t offset);
-    
-    double
-    GetDouble (lldb::SBError& error, lldb::offset_t offset);
-
-    long double
-    GetLongDouble (lldb::SBError& error, lldb::offset_t offset);
-    
-    lldb::addr_t
-    GetAddress (lldb::SBError& error, lldb::offset_t offset);
-    
-    uint8_t
-    GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset);
-
-    uint16_t
-    GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset);
-
-    uint32_t
-    GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset);
-
-    uint64_t
-    GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset);
-    
-    int8_t
-    GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset);
-    
-    int16_t
-    GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset);
-    
-    int32_t
-    GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset);
-    
-    int64_t
-    GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset);
-    
-    const char*
-    GetString (lldb::SBError& error, lldb::offset_t offset);
-    
-    size_t
-    ReadRawData (lldb::SBError& error,
-                 lldb::offset_t offset,
-                 void *buf,
-                 size_t size);
-    
-    bool
-    GetDescription (lldb::SBStream &description, lldb::addr_t base_addr = LLDB_INVALID_ADDRESS);
-    
-    // it would be nice to have SetData(SBError, const void*, size_t) when endianness and address size can be
-    // inferred from the existing DataExtractor, but having two SetData() signatures triggers a SWIG bug where
-    // the typemap isn't applied before resolving the overload, and thus the right function never gets called
-    void
-    SetData (lldb::SBError& error, const void *buf, size_t size, lldb::ByteOrder endian, uint8_t addr_size);
-    
-    // see SetData() for why we don't have Append(const void* buf, size_t size)
-    bool
-    Append (const SBData& rhs);
-    
-    static lldb::SBData
-    CreateDataFromCString (lldb::ByteOrder endian, uint32_t addr_byte_size, const char* data);
-    
-    // in the following CreateData*() and SetData*() prototypes, the two parameters array and array_len
-    // should not be renamed or rearranged, because doing so will break the SWIG typemap
-    static lldb::SBData
-    CreateDataFromUInt64Array (lldb::ByteOrder endian, uint32_t addr_byte_size, uint64_t* array, size_t array_len);
-    
-    static lldb::SBData
-    CreateDataFromUInt32Array (lldb::ByteOrder endian, uint32_t addr_byte_size, uint32_t* array, size_t array_len);
-    
-    static lldb::SBData
-    CreateDataFromSInt64Array (lldb::ByteOrder endian, uint32_t addr_byte_size, int64_t* array, size_t array_len);
-    
-    static lldb::SBData
-    CreateDataFromSInt32Array (lldb::ByteOrder endian, uint32_t addr_byte_size, int32_t* array, size_t array_len);
-    
-    static lldb::SBData
-    CreateDataFromDoubleArray (lldb::ByteOrder endian, uint32_t addr_byte_size, double* array, size_t array_len);
-    
-    bool
-    SetDataFromCString (const char* data);
-    
-    bool
-    SetDataFromUInt64Array (uint64_t* array, size_t array_len);
-    
-    bool
-    SetDataFromUInt32Array (uint32_t* array, size_t array_len);
-    
-    bool
-    SetDataFromSInt64Array (int64_t* array, size_t array_len);
-    
-    bool
-    SetDataFromSInt32Array (int32_t* array, size_t array_len);
-    
-    bool
-    SetDataFromDoubleArray (double* array, size_t array_len);
-
-    
-protected:
-    
-    // Mimic shared pointer...
-    lldb_private::DataExtractor *
-    get() const;
-    
-    lldb_private::DataExtractor *
-    operator->() const;
-    
-    lldb::DataExtractorSP &
-    operator*();
-    
-    const lldb::DataExtractorSP &
-    operator*() const;
-
-    SBData (const lldb::DataExtractorSP &data_sp);
-
-    void
-    SetOpaque (const lldb::DataExtractorSP &data_sp);
-
-private:
-    friend class SBInstruction;
-    friend class SBProcess;
-    friend class SBSection;
-    friend class SBTarget;
-    friend class SBValue;
-
-    lldb::DataExtractorSP  m_opaque_sp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBData_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDebugger.h b/kcov-38/external/lldb/include/lldb/API/SBDebugger.h
deleted file mode 100644
index 4f2c1d7f8756..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBDebugger.h
+++ /dev/null
@@ -1,363 +0,0 @@
-//===-- SBDebugger.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBDebugger_h_
-#define LLDB_SBDebugger_h_
-
-#include <stdio.h>
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBPlatform.h"
-
-namespace lldb {
-
-    
-class LLDB_API SBInputReader
-{
-public:
-    SBInputReader();
-    ~SBInputReader();
-    SBError Initialize(lldb::SBDebugger&, unsigned long (*)(void*, lldb::SBInputReader*, lldb::InputReaderAction, char const*, unsigned long), void*, lldb::InputReaderGranularity, char const*, char const*, bool);
-    void SetIsDone(bool);
-    bool IsActive() const;
-};
-
-class LLDB_API SBDebugger
-{
-public:
-
-    static void
-    Initialize();
-    
-    static void
-    Terminate();
-    
-    // Deprecated, use the one that takes a source_init_files bool.
-    static lldb::SBDebugger
-    Create();
-
-    static lldb::SBDebugger
-    Create(bool source_init_files);
-
-    static lldb::SBDebugger
-    Create(bool source_init_files, lldb::LogOutputCallback log_callback, void *baton);
-
-    static void
-    Destroy (lldb::SBDebugger &debugger);
-
-    static void
-    MemoryPressureDetected ();
-
-    SBDebugger();
-
-    SBDebugger(const lldb::SBDebugger &rhs);
-
-    SBDebugger(const lldb::DebuggerSP &debugger_sp);
-    
-    lldb::SBDebugger &
-    operator = (const lldb::SBDebugger &rhs);
-    
-    ~SBDebugger();
-
-    bool
-    IsValid() const;
-
-    void
-    Clear ();
-
-    void
-    SetAsync (bool b);
-    
-    bool 
-    GetAsync ();
-
-    void
-    SkipLLDBInitFiles (bool b);
-
-    void
-    SkipAppInitFiles (bool b);
-
-    void
-    SetInputFileHandle (FILE *f, bool transfer_ownership);
-
-    void
-    SetOutputFileHandle (FILE *f, bool transfer_ownership);
-
-    void
-    SetErrorFileHandle (FILE *f, bool transfer_ownership);
-    
-    FILE *
-    GetInputFileHandle ();
-
-    FILE *
-    GetOutputFileHandle ();
-
-    FILE *
-    GetErrorFileHandle ();
-
-    void
-    SaveInputTerminalState();
-    
-    void
-    RestoreInputTerminalState();
-
-    lldb::SBCommandInterpreter
-    GetCommandInterpreter ();
-
-    void
-    HandleCommand (const char *command);
-
-    lldb::SBListener
-    GetListener ();
-
-    void
-    HandleProcessEvent (const lldb::SBProcess &process,
-                        const lldb::SBEvent &event,
-                        FILE *out,
-                        FILE *err);
-
-    lldb::SBTarget
-    CreateTarget (const char *filename,
-                  const char *target_triple,
-                  const char *platform_name,
-                  bool add_dependent_modules,
-                  lldb::SBError& error);
-
-    lldb::SBTarget
-    CreateTargetWithFileAndTargetTriple (const char *filename,
-                                         const char *target_triple);
-
-    lldb::SBTarget
-    CreateTargetWithFileAndArch (const char *filename,
-                                 const char *archname);
-
-    lldb::SBTarget
-    CreateTarget (const char *filename);
-
-    // Return true if target is deleted from the target list of the debugger.
-    bool
-    DeleteTarget (lldb::SBTarget &target);
-
-    lldb::SBTarget
-    GetTargetAtIndex (uint32_t idx);
-    
-    uint32_t
-    GetIndexOfTarget (lldb::SBTarget target);
-
-    lldb::SBTarget
-    FindTargetWithProcessID (pid_t pid);
-
-    lldb::SBTarget
-    FindTargetWithFileAndArch (const char *filename,
-                               const char *arch);
-
-    uint32_t
-    GetNumTargets ();
-
-    lldb::SBTarget
-    GetSelectedTarget ();
-
-    void
-    SetSelectedTarget (SBTarget& target);
-
-    lldb::SBPlatform
-    GetSelectedPlatform();
-
-    void
-    SetSelectedPlatform(lldb::SBPlatform &platform);
-
-    lldb::SBSourceManager
-    GetSourceManager ();
-
-    // REMOVE: just for a quick fix, need to expose platforms through
-    // SBPlatform from this class.
-    lldb::SBError
-    SetCurrentPlatform (const char *platform_name);
-    
-    bool
-    SetCurrentPlatformSDKRoot (const char *sysroot);
-
-    // FIXME: Once we get the set show stuff in place, the driver won't need
-    // an interface to the Set/Get UseExternalEditor.
-    bool
-    SetUseExternalEditor (bool input);
-    
-    bool 
-    GetUseExternalEditor ();
-
-    bool
-    SetUseColor (bool use_color);
-
-    bool
-    GetUseColor () const;
-
-    static bool
-    GetDefaultArchitecture (char *arch_name, size_t arch_name_len);
-
-    static bool
-    SetDefaultArchitecture (const char *arch_name);
-
-    lldb::ScriptLanguage
-    GetScriptingLanguage (const char *script_language_name);
-
-    static const char *
-    GetVersionString ();
-
-    static const char *
-    StateAsCString (lldb::StateType state);
-
-    static bool
-    StateIsRunningState (lldb::StateType state);
-
-    static bool
-    StateIsStoppedState (lldb::StateType state);
-    
-    bool
-    EnableLog (const char *channel, const char **categories);
-
-    void
-    SetLoggingCallback (lldb::LogOutputCallback log_callback, void *baton);
-    
-    // DEPRECATED
-    void
-    DispatchInput (void* baton,
-                   const void* data,
-                   size_t data_len);
-    
-    void
-    DispatchInput (const void *data, size_t data_len);
-
-    void
-    DispatchInputInterrupt ();
-
-    void
-    DispatchInputEndOfFile ();
-    
-    void
-    PushInputReader (lldb::SBInputReader &reader);
-
-    const char *
-    GetInstanceName  ();
-
-    static SBDebugger
-    FindDebuggerWithID (int id);
-
-    static lldb::SBError
-    SetInternalVariable (const char *var_name, const char *value, const char *debugger_instance_name);
-
-    static lldb::SBStringList
-    GetInternalVariableValue (const char *var_name, const char *debugger_instance_name);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    uint32_t
-    GetTerminalWidth () const;
-
-    void
-    SetTerminalWidth (uint32_t term_width);
-
-    lldb::user_id_t
-    GetID ();
-    
-    const char *
-    GetPrompt() const;
-
-    void
-    SetPrompt (const char *prompt);
-        
-    lldb::ScriptLanguage 
-    GetScriptLanguage() const;
-
-    void
-    SetScriptLanguage (lldb::ScriptLanguage script_lang);
-
-    bool
-    GetCloseInputOnEOF () const;
-    
-    void
-    SetCloseInputOnEOF (bool b);
-
-    SBTypeCategory
-    GetCategory (const char* category_name);
-
-    SBTypeCategory
-    CreateCategory (const char* category_name);
-    
-    bool
-    DeleteCategory (const char* category_name);
-    
-    uint32_t
-    GetNumCategories ();
-    
-    SBTypeCategory
-    GetCategoryAtIndex (uint32_t);
-    
-    SBTypeCategory
-    GetDefaultCategory();
-    
-    SBTypeFormat
-    GetFormatForType (SBTypeNameSpecifier);
-
-#ifndef LLDB_DISABLE_PYTHON
-    SBTypeSummary
-    GetSummaryForType (SBTypeNameSpecifier);
-#endif
-
-    SBTypeFilter
-    GetFilterForType (SBTypeNameSpecifier);
-
-#ifndef LLDB_DISABLE_PYTHON
-    SBTypeSynthetic
-    GetSyntheticForType (SBTypeNameSpecifier);
-#endif
-
-    void
-    RunCommandInterpreter (bool auto_handle_events,
-                           bool spawn_thread);
-
-    void
-    RunCommandInterpreter (bool auto_handle_events,
-                           bool spawn_thread,
-                           SBCommandInterpreterRunOptions &options,
-                           int  &num_errors,
-                           bool &quit_requested,
-                           bool &stopped_for_crash);
-private:
-
-    friend class SBCommandInterpreter;
-    friend class SBInputReader;
-    friend class SBListener;
-    friend class SBProcess;
-    friend class SBSourceManager;
-    friend class SBTarget;
-    
-    lldb::SBTarget
-    FindTargetWithLLDBProcess (const lldb::ProcessSP &processSP);
-
-    void
-    reset (const lldb::DebuggerSP &debugger_sp);
-
-    lldb_private::Debugger *
-    get () const;
-
-    lldb_private::Debugger &
-    ref () const;
-
-    const lldb::DebuggerSP &
-    get_sp () const;
-    
-    lldb::DebuggerSP m_opaque_sp;
-
-}; // class SBDebugger
-
-
-} // namespace lldb
-
-#endif // LLDB_SBDebugger_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h b/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
deleted file mode 100644
index 5461a1f15c2e..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBDeclaration.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//===-- SBDeclaration.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBDeclaration_h_
-#define LLDB_SBDeclaration_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBFileSpec.h"
-
-namespace lldb {
-    
-    class LLDB_API SBDeclaration
-    {
-    public:
-        
-        SBDeclaration ();
-        
-        SBDeclaration (const lldb::SBDeclaration &rhs);
-        
-        ~SBDeclaration ();
-        
-        const lldb::SBDeclaration &
-        operator = (const lldb::SBDeclaration &rhs);
-        
-        bool
-        IsValid () const;
-        
-        lldb::SBFileSpec
-        GetFileSpec () const;
-        
-        uint32_t
-        GetLine () const;
-        
-        uint32_t
-        GetColumn () const;
-        
-        void
-        SetFileSpec (lldb::SBFileSpec filespec);
-        
-        void
-        SetLine (uint32_t line);
-        
-        void
-        SetColumn (uint32_t column);
-        
-        bool
-        operator == (const lldb::SBDeclaration &rhs) const;
-        
-        bool
-        operator != (const lldb::SBDeclaration &rhs) const;
-        
-        bool
-        GetDescription (lldb::SBStream &description);
-        
-    protected:
-        
-        lldb_private::Declaration *
-        get ();
-        
-    private:
-        friend class SBValue;
-        
-        const lldb_private::Declaration *
-        operator->() const;
-        
-        lldb_private::Declaration &
-        ref();
-        
-        const lldb_private::Declaration &
-        ref() const;
-        
-        SBDeclaration (const lldb_private::Declaration *lldb_object_ptr);
-        
-        void
-        SetDeclaration (const lldb_private::Declaration &lldb_object_ref);
-        
-        std::unique_ptr<lldb_private::Declaration> m_opaque_ap;
-    };
-    
-    
-} // namespace lldb
-
-#endif // LLDB_SBDeclaration_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBDefines.h b/kcov-38/external/lldb/include/lldb/API/SBDefines.h
deleted file mode 100644
index 09bea502dd01..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBDefines.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//===-- SBDefines.h ---------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBDefines_h_
-#define LLDB_SBDefines_h_
-
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-
-#include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h"
-#include "lldb/lldb-forward.h"
-#include "lldb/lldb-types.h"
-#include "lldb/lldb-versioning.h"
-
-#ifdef SWIG
-#define LLDB_API
-#endif
-
-// Forward Declarations
-namespace lldb {
-
-class LLDB_API SBAddress;
-class LLDB_API SBBlock;
-class LLDB_API SBBreakpoint;
-class LLDB_API SBBreakpointLocation;
-class LLDB_API SBBroadcaster;
-class LLDB_API SBCommand;
-class LLDB_API SBCommandInterpreter;
-class LLDB_API SBCommandInterpreterRunOptions;
-class LLDB_API SBCommandPluginInterface;
-class LLDB_API SBCommandReturnObject;
-class LLDB_API SBCommunication;
-class LLDB_API SBCompileUnit;
-class LLDB_API SBData;
-class LLDB_API SBDebugger;
-class LLDB_API SBDeclaration;
-class LLDB_API SBError;
-class LLDB_API SBEvent;
-class LLDB_API SBEventList;
-class LLDB_API SBExecutionContext;
-class LLDB_API SBExpressionOptions;
-class LLDB_API SBFileSpec;
-class LLDB_API SBFileSpecList;
-class LLDB_API SBFrame;
-class LLDB_API SBFunction;
-class LLDB_API SBHostOS;
-class LLDB_API SBInstruction;
-class LLDB_API SBInstructionList;
-class LLDB_API SBLanguageRuntime;
-class LLDB_API SBLaunchInfo;
-class LLDB_API SBLineEntry;
-class LLDB_API SBListener;
-class LLDB_API SBModule;
-class LLDB_API SBModuleSpec;
-class LLDB_API SBModuleSpecList;
-class LLDB_API SBProcess;
-class LLDB_API SBQueue;
-class LLDB_API SBQueueItem;
-class LLDB_API SBSection;
-class LLDB_API SBSourceManager;
-class LLDB_API SBStream;
-class LLDB_API SBStringList;
-class LLDB_API SBSymbol;
-class LLDB_API SBSymbolContext;
-class LLDB_API SBSymbolContextList;
-class LLDB_API SBTarget;
-class LLDB_API SBThread;
-class LLDB_API SBThreadCollection;
-class LLDB_API SBThreadPlan;
-class LLDB_API SBType;
-class LLDB_API SBTypeCategory;
-class LLDB_API SBTypeEnumMember;
-class LLDB_API SBTypeEnumMemberList;
-class LLDB_API SBTypeFilter;
-class LLDB_API SBTypeFormat;
-class LLDB_API SBTypeMemberFunction;
-class LLDB_API SBTypeNameSpecifier;
-class LLDB_API SBTypeSummary;
-class LLDB_API SBTypeSummaryOptions;
-#ifndef LLDB_DISABLE_PYTHON
-class LLDB_API SBTypeSynthetic;
-#endif
-class LLDB_API SBTypeList;
-class LLDB_API SBValue;
-class LLDB_API SBValueList;
-class LLDB_API SBVariablesOptions;
-class LLDB_API SBWatchpoint;
-class LLDB_API SBUnixSignals;
-
-}
-
-#endif  // LLDB_SBDefines_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBError.h b/kcov-38/external/lldb/include/lldb/API/SBError.h
deleted file mode 100644
index afdec0d3826d..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBError.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//===-- SBError.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBError_h_
-#define LLDB_SBError_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBError {
-public:
-    SBError ();
-
-    SBError (const lldb::SBError &rhs);
-
-    ~SBError();
-
-    const SBError &
-    operator =(const lldb::SBError &rhs);
-
-    const char *
-    GetCString () const;
-
-    void
-    Clear ();
-
-    bool
-    Fail () const;
-
-    bool
-    Success () const;
-
-    uint32_t
-    GetError () const;
-
-    lldb::ErrorType
-    GetType () const;
-
-    void
-    SetError (uint32_t err, lldb::ErrorType type);
-
-    void
-    SetErrorToErrno ();
-
-    void
-    SetErrorToGenericError ();
-
-    void
-    SetErrorString (const char *err_str);
-
-    int
-    SetErrorStringWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
-
-    bool
-    IsValid () const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-protected:
-
-    friend class SBCommandReturnObject;
-    friend class SBData;
-    friend class SBDebugger;
-    friend class SBCommunication;
-    friend class SBHostOS;
-    friend class SBPlatform;
-    friend class SBProcess;
-    friend class SBThread;
-    friend class SBTarget;
-    friend class SBValue;
-    friend class SBWatchpoint;
-    friend class SBBreakpoint;
-    friend class SBBreakpointLocation;
-
-    lldb_private::Error *
-    get();
-
-    lldb_private::Error *
-    operator->();
-
-    const lldb_private::Error &
-    operator*() const;
-
-    lldb_private::Error &
-    ref();
-
-    void
-    SetError (const lldb_private::Error &lldb_error);
-
-private:
-    std::unique_ptr<lldb_private::Error> m_opaque_ap;
-
-    void
-    CreateIfNeeded ();
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBError_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBEvent.h b/kcov-38/external/lldb/include/lldb/API/SBEvent.h
deleted file mode 100644
index 975c365f5916..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBEvent.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//===-- SBEvent.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBEvent_h_
-#define LLDB_SBEvent_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-#include <vector>
-
-
-namespace lldb {
-
-class SBBroadcaster;
-
-class LLDB_API SBEvent
-{
-public:
-    SBEvent();
-
-    SBEvent (const lldb::SBEvent &rhs);
-    
-    // Make an event that contains a C string.
-    SBEvent (uint32_t event, const char *cstr, uint32_t cstr_len);
-
-    SBEvent (lldb::EventSP &event_sp);
-
-    SBEvent (lldb_private::Event *event_sp);
-
-    ~SBEvent();
-
-    const SBEvent &
-    operator = (const lldb::SBEvent &rhs);
-
-    bool
-    IsValid() const;
-
-    const char *
-    GetDataFlavor ();
-
-    uint32_t
-    GetType () const;
-
-    lldb::SBBroadcaster
-    GetBroadcaster () const;
-
-    const char *
-    GetBroadcasterClass () const;
-
-    bool
-    BroadcasterMatchesPtr (const lldb::SBBroadcaster *broadcaster);
-
-    bool
-    BroadcasterMatchesRef (const lldb::SBBroadcaster &broadcaster);
-
-    void
-    Clear();
-
-    static const char *
-    GetCStringFromEvent (const lldb::SBEvent &event);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    bool
-    GetDescription (lldb::SBStream &description) const;
-
-protected:
-    friend class SBListener;
-    friend class SBBroadcaster;
-    friend class SBBreakpoint;
-    friend class SBDebugger;
-    friend class SBProcess;
-    friend class SBTarget;
-    friend class SBThread;
-    friend class SBWatchpoint;
-
-    lldb::EventSP &
-    GetSP () const;
-
-    void
-    reset (lldb::EventSP &event_sp);
-
-    void
-    reset (lldb_private::Event* event);
-
-    lldb_private::Event *
-    get () const;
-
-private:
-
-    mutable lldb::EventSP m_event_sp;
-    mutable lldb_private::Event *m_opaque_ptr;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBEvent_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h b/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
deleted file mode 100644
index 1d64497ae867..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBExecutionContext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//===-- SBExecutionContext.h -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBExecutionContext_h_
-#define LLDB_SBExecutionContext_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-#include <vector>
-
-
-namespace lldb {
-    
-class LLDB_API SBExecutionContext
-{
-friend class SBCommandInterpreter;
-
-public:
-    SBExecutionContext();
-    
-    SBExecutionContext (const lldb::SBExecutionContext &rhs);
-    
-    SBExecutionContext (lldb::ExecutionContextRefSP exe_ctx_ref_sp);
-    
-    SBExecutionContext (const lldb::SBTarget &target);
-    
-    SBExecutionContext (const lldb::SBProcess &process);
-    
-    SBExecutionContext (lldb::SBThread thread); // can't be a const& because SBThread::get() isn't itself a const function
-    
-    SBExecutionContext (const lldb::SBFrame &frame);
-    
-    ~SBExecutionContext();
-    
-    const SBExecutionContext &
-    operator = (const lldb::SBExecutionContext &rhs);
-    
-    SBTarget
-    GetTarget () const;
-    
-    SBProcess
-    GetProcess () const;
-
-    SBThread
-    GetThread () const;
-
-    SBFrame
-    GetFrame () const;
-    
-protected:
-    ExecutionContextRefSP &
-    GetSP () const;
-    
-    void
-    reset (lldb::ExecutionContextRefSP &event_sp);
-    
-    lldb_private::ExecutionContextRef *
-    get () const;
-    
-private:
-    
-    mutable lldb::ExecutionContextRefSP m_exe_ctx_sp;
-};
-    
-} // namespace lldb
-
-#endif  // LLDB_SBExecutionContext_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h b/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
deleted file mode 100644
index ed2f9187b3e0..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBExpressionOptions.h
+++ /dev/null
@@ -1,135 +0,0 @@
-//===-- SBEvent.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBExpressionOptions_h_
-#define LLDB_SBExpressionOptions_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <vector>
-
-namespace lldb {
-
-
-class LLDB_API SBExpressionOptions
-{
-public:
-    SBExpressionOptions();
-
-    SBExpressionOptions (const lldb::SBExpressionOptions &rhs);
-    
-    ~SBExpressionOptions();
-
-    const SBExpressionOptions &
-    operator = (const lldb::SBExpressionOptions &rhs);
-
-    bool
-    GetCoerceResultToId () const;
-    
-    void
-    SetCoerceResultToId (bool coerce = true);
-    
-    bool
-    GetUnwindOnError () const;
-    
-    void
-    SetUnwindOnError (bool unwind = true);
-    
-    bool
-    GetIgnoreBreakpoints () const;
-    
-    void
-    SetIgnoreBreakpoints (bool ignore = true);
-    
-    lldb::DynamicValueType
-    GetFetchDynamicValue () const;
-    
-    void
-    SetFetchDynamicValue (lldb::DynamicValueType dynamic = lldb::eDynamicCanRunTarget);
-    
-    uint32_t
-    GetTimeoutInMicroSeconds () const;
-    
-    // Set the timeout for the expression, 0 means wait forever.
-    void
-    SetTimeoutInMicroSeconds (uint32_t timeout = 0);
-    
-    uint32_t
-    GetOneThreadTimeoutInMicroSeconds () const;
-    
-    // Set the timeout for running on one thread, 0 means use the default behavior.
-    // If you set this higher than the overall timeout, you'll get an error when you
-    // try to run the expression.
-    void
-    SetOneThreadTimeoutInMicroSeconds (uint32_t timeout = 0);
-    
-    bool
-    GetTryAllThreads () const;
-    
-    void
-    SetTryAllThreads (bool run_others = true);
-    
-    bool
-    GetStopOthers() const;
-    
-    void
-    SetStopOthers(bool stop_others = true);
-
-    bool
-    GetTrapExceptions () const;
-    
-    void
-    SetTrapExceptions (bool trap_exceptions = true);
-    
-    void
-    SetLanguage (lldb::LanguageType language);
-
-    void
-    SetCancelCallback (lldb::ExpressionCancelCallback callback, void *baton);
-
-    bool
-    GetGenerateDebugInfo ();
-    
-    void
-    SetGenerateDebugInfo (bool b = true);
-    
-    bool
-    GetSuppressPersistentResult ();
-    
-    void
-    SetSuppressPersistentResult (bool b = false);
-
-    const char *
-    GetPrefix () const;
-
-    void
-    SetPrefix (const char *prefix);
-
-protected:
-
-    SBExpressionOptions (lldb_private::EvaluateExpressionOptions &expression_options);
-
-    lldb_private::EvaluateExpressionOptions *
-    get () const;
-
-    lldb_private::EvaluateExpressionOptions &
-    ref () const;
-
-    friend class SBFrame;
-    friend class SBValue;
-    friend class SBTarget;
-
-private:
-    // This auto_pointer is made in the constructor and is always valid.
-    mutable std::unique_ptr<lldb_private::EvaluateExpressionOptions> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBExpressionOptions_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h b/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
deleted file mode 100644
index d6f38f5b2d74..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBFileSpec.h
+++ /dev/null
@@ -1,104 +0,0 @@
-//===-- SBFileSpec.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBFileSpec_h_
-#define LLDB_SBFileSpec_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBFileSpec
-{
-public:
-    SBFileSpec ();
-
-    SBFileSpec (const lldb::SBFileSpec &rhs);
-
-    SBFileSpec (const char *path);// Deprecated, use SBFileSpec (const char *path, bool resolve)
-
-    SBFileSpec (const char *path, bool resolve);
-
-    ~SBFileSpec ();
-
-    const SBFileSpec &
-    operator = (const lldb::SBFileSpec &rhs);
-
-    bool
-    IsValid() const;
-
-    bool
-    Exists () const;
-
-    bool
-    ResolveExecutableLocation ();
-
-    const char *
-    GetFilename() const;
-
-    const char *
-    GetDirectory() const;
-
-    void
-    SetFilename(const char *filename);
-    
-    void
-    SetDirectory(const char *directory);
-
-    uint32_t
-    GetPath (char *dst_path, size_t dst_len) const;
-
-    static int
-    ResolvePath (const char *src_path, char *dst_path, size_t dst_len);
-
-    bool
-    GetDescription (lldb::SBStream &description) const;
-
-private:
-    friend class SBAttachInfo;
-    friend class SBBlock;
-    friend class SBCommandInterpreter;
-    friend class SBCompileUnit;
-    friend class SBDeclaration;
-    friend class SBFileSpecList;
-    friend class SBHostOS;
-    friend class SBLaunchInfo;
-    friend class SBLineEntry;
-    friend class SBModule;
-    friend class SBModuleSpec;
-    friend class SBPlatform;
-    friend class SBProcess;
-    friend class SBSourceManager;
-    friend class SBThread;
-    friend class SBTarget;
-
-    SBFileSpec (const lldb_private::FileSpec& fspec);
-
-    void
-    SetFileSpec (const lldb_private::FileSpec& fspec);
-
-    const lldb_private::FileSpec *
-    operator->() const;
-
-    const lldb_private::FileSpec *
-    get() const;
-
-    const lldb_private::FileSpec &
-    operator*() const;
-
-    const lldb_private::FileSpec &
-    ref() const;
-
-    std::unique_ptr<lldb_private::FileSpec> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBFileSpec_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h b/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
deleted file mode 100644
index ff429a1815be..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBFileSpecList.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//===-- SBFileSpecList.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBFileSpecList_h_
-#define LLDB_SBFileSpecList_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBFileSpecList
-{
-public:
-    SBFileSpecList ();
-
-    SBFileSpecList (const lldb::SBFileSpecList &rhs);
-
-    ~SBFileSpecList ();
-
-    const SBFileSpecList &
-    operator = (const lldb::SBFileSpecList &rhs);
-
-    uint32_t
-    GetSize () const;
-
-    bool
-    GetDescription (SBStream &description) const;
-    
-    void
-    Append (const SBFileSpec &sb_file);
-    
-    bool
-    AppendIfUnique (const SBFileSpec &sb_file);
-    
-    void
-    Clear();
-    
-    uint32_t
-    FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full);
-    
-    const SBFileSpec
-    GetFileSpecAtIndex (uint32_t idx) const;
-
-private:
-
-friend class SBTarget;
-
-    const lldb_private::FileSpecList *
-    operator->() const;
-
-    const lldb_private::FileSpecList *
-    get() const;
-
-    const lldb_private::FileSpecList &
-    operator*() const;
-
-    const lldb_private::FileSpecList &
-    ref() const;
-
-    std::unique_ptr<lldb_private::FileSpecList> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBFileSpecList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFrame.h b/kcov-38/external/lldb/include/lldb/API/SBFrame.h
deleted file mode 100644
index 2ca9e062490d..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBFrame.h
+++ /dev/null
@@ -1,237 +0,0 @@
-//===-- SBFrame.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBFrame_h_
-#define LLDB_SBFrame_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBValueList.h"
-
-namespace lldb {
-
-class LLDB_API SBFrame
-{
-public:
-    SBFrame ();
-
-    SBFrame (const lldb::SBFrame &rhs);
-    
-    const lldb::SBFrame &
-    operator =(const lldb::SBFrame &rhs);
-
-    ~SBFrame();
-
-    bool
-    IsEqual (const lldb::SBFrame &that) const;
-
-    bool
-    IsValid() const;
-
-    uint32_t
-    GetFrameID () const;
-
-    lldb::addr_t
-    GetCFA () const;
-
-    lldb::addr_t
-    GetPC () const;
-
-    bool
-    SetPC (lldb::addr_t new_pc);
-
-    lldb::addr_t
-    GetSP () const;
-
-    lldb::addr_t
-    GetFP () const;
-
-    lldb::SBAddress
-    GetPCAddress () const;
-
-    lldb::SBSymbolContext
-    GetSymbolContext (uint32_t resolve_scope) const;
-
-    lldb::SBModule
-    GetModule () const;
-
-    lldb::SBCompileUnit
-    GetCompileUnit () const;
-
-    lldb::SBFunction
-    GetFunction () const;
-
-    lldb::SBSymbol
-    GetSymbol () const;
-
-    /// Gets the deepest block that contains the frame PC.
-    ///
-    /// See also GetFrameBlock().
-    lldb::SBBlock
-    GetBlock () const;
-
-    /// Get the appropriate function name for this frame. Inlined functions in
-    /// LLDB are represented by Blocks that have inlined function information, so
-    /// just looking at the SBFunction or SBSymbol for a frame isn't enough.
-    /// This function will return the appropriate function, symbol or inlined
-    /// function name for the frame.
-    ///
-    /// This function returns:
-    /// - the name of the inlined function (if there is one)
-    /// - the name of the concrete function (if there is one)
-    /// - the name of the symbol (if there is one)
-    /// - NULL
-    ///
-    /// See also IsInlined().
-    const char *
-    GetFunctionName();
-
-    const char *
-    GetFunctionName() const;
-
-    /// Return true if this frame represents an inlined function.
-    ///
-    /// See also GetFunctionName().
-    bool
-    IsInlined();
-
-    bool
-    IsInlined() const;
-
-    /// The version that doesn't supply a 'use_dynamic' value will use the
-    /// target's default.
-    lldb::SBValue
-    EvaluateExpression (const char *expr);    
-
-    lldb::SBValue
-    EvaluateExpression (const char *expr, lldb::DynamicValueType use_dynamic);
-
-    lldb::SBValue
-    EvaluateExpression (const char *expr, lldb::DynamicValueType use_dynamic, bool unwind_on_error);
-    
-    lldb::SBValue
-    EvaluateExpression (const char *expr, const SBExpressionOptions &options);
-
-    /// Gets the lexical block that defines the stack frame. Another way to think
-    /// of this is it will return the block that contains all of the variables
-    /// for a stack frame. Inlined functions are represented as SBBlock objects
-    /// that have inlined function information: the name of the inlined function,
-    /// where it was called from. The block that is returned will be the first 
-    /// block at or above the block for the PC (SBFrame::GetBlock()) that defines
-    /// the scope of the frame. When a function contains no inlined functions,
-    /// this will be the top most lexical block that defines the function. 
-    /// When a function has inlined functions and the PC is currently
-    /// in one of those inlined functions, this method will return the inlined
-    /// block that defines this frame. If the PC isn't currently in an inlined
-    /// function, the lexical block that defines the function is returned.
-    lldb::SBBlock
-    GetFrameBlock () const;
-
-    lldb::SBLineEntry
-    GetLineEntry () const;
-
-    lldb::SBThread
-    GetThread () const;
-
-    const char *
-    Disassemble () const;
-
-    void
-    Clear();
-
-    bool
-    operator == (const lldb::SBFrame &rhs) const;
-
-    bool
-    operator != (const lldb::SBFrame &rhs) const;
-
-    /// The version that doesn't supply a 'use_dynamic' value will use the
-    /// target's default.
-    lldb::SBValueList
-    GetVariables (bool arguments,
-                  bool locals,
-                  bool statics,
-                  bool in_scope_only);
-
-    lldb::SBValueList
-    GetVariables (bool arguments,
-                  bool locals,
-                  bool statics,
-                  bool in_scope_only,
-                  lldb::DynamicValueType  use_dynamic);
-
-    lldb::SBValueList
-    GetVariables (const lldb::SBVariablesOptions& options);
-    
-    lldb::SBValueList
-    GetRegisters ();
-
-    lldb::SBValue
-    FindRegister (const char *name);
-
-    /// The version that doesn't supply a 'use_dynamic' value will use the
-    /// target's default.
-    lldb::SBValue
-    FindVariable (const char *var_name);
-
-    lldb::SBValue
-    FindVariable (const char *var_name, lldb::DynamicValueType use_dynamic);
-
-    // Find a value for a variable expression path like "rect.origin.x" or
-    // "pt_ptr->x", "*self", "*this->obj_ptr". The returned value is _not_
-    // and expression result and is not a constant object like 
-    // SBFrame::EvaluateExpression(...) returns, but a child object of 
-    // the variable value.
-    lldb::SBValue
-    GetValueForVariablePath (const char *var_expr_cstr, 
-                             DynamicValueType use_dynamic);
-
-    /// The version that doesn't supply a 'use_dynamic' value will use the
-    /// target's default.
-    lldb::SBValue
-    GetValueForVariablePath (const char *var_path);
-
-    /// Find variables, register sets, registers, or persistent variables using
-    /// the frame as the scope.
-    ///
-    /// NB. This function does not look up ivars in the function object pointer.
-    /// To do that use GetValueForVariablePath.
-    ///
-    /// The version that doesn't supply a 'use_dynamic' value will use the
-    /// target's default.
-    lldb::SBValue
-    FindValue (const char *name, ValueType value_type);
-
-    lldb::SBValue
-    FindValue (const char *name, ValueType value_type, lldb::DynamicValueType use_dynamic);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    SBFrame (const lldb::StackFrameSP &lldb_object_sp);
-
-protected:
-
-    friend class SBBlock;
-    friend class SBExecutionContext;
-    friend class SBInstruction;
-    friend class SBThread;
-    friend class SBValue;
-
-    lldb::StackFrameSP
-    GetFrameSP() const;
-
-    void
-    SetFrameSP (const lldb::StackFrameSP &lldb_object_sp);
-
-    lldb::ExecutionContextRefSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBFrame_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBFunction.h b/kcov-38/external/lldb/include/lldb/API/SBFunction.h
deleted file mode 100644
index 7d578393eb2c..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBFunction.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//===-- SBFunction.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBFunction_h_
-#define LLDB_SBFunction_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-#include "lldb/API/SBInstructionList.h"
-
-namespace lldb {
-
-class LLDB_API SBFunction
-{
-public:
-
-    SBFunction ();
-
-    SBFunction (const lldb::SBFunction &rhs);
-
-    const lldb::SBFunction &
-    operator = (const lldb::SBFunction &rhs);
-
-    ~SBFunction ();
-
-    bool
-    IsValid () const;
-
-    const char *
-    GetName() const;
-
-    const char *
-    GetMangledName () const;
-
-    lldb::SBInstructionList
-    GetInstructions (lldb::SBTarget target);
-
-    lldb::SBInstructionList
-    GetInstructions (lldb::SBTarget target, const char *flavor);
-
-    lldb::SBAddress
-    GetStartAddress ();
-
-    lldb::SBAddress
-    GetEndAddress ();
-
-    uint32_t
-    GetPrologueByteSize ();
-
-    lldb::SBType
-    GetType ();
-
-    lldb::SBBlock
-    GetBlock ();
-    
-    lldb::LanguageType
-    GetLanguage ();
-
-    bool
-    operator == (const lldb::SBFunction &rhs) const;
-
-    bool
-    operator != (const lldb::SBFunction &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-protected:
-
-    lldb_private::Function *
-    get ();
-
-    void
-    reset (lldb_private::Function *lldb_object_ptr);
-
-private:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBSymbolContext;
-
-    SBFunction (lldb_private::Function *lldb_object_ptr);
-
-
-    lldb_private::Function *m_opaque_ptr;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBFunction_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBHostOS.h b/kcov-38/external/lldb/include/lldb/API/SBHostOS.h
deleted file mode 100644
index d9bc97365632..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBHostOS.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//===-- SBHostOS.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBHostOS_h_
-#define LLDB_SBHostOS_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBFileSpec.h"
-
-namespace lldb {
-
-class LLDB_API SBHostOS
-{
-public:
-
-    static lldb::SBFileSpec
-    GetProgramFileSpec ();
-    
-    static lldb::SBFileSpec
-    GetLLDBPythonPath ();
-
-    static lldb::SBFileSpec
-    GetLLDBPath (lldb::PathType path_type);
-
-    static void
-    ThreadCreated (const char *name);
-
-    static lldb::thread_t
-    ThreadCreate (const char *name,
-                  lldb::thread_func_t thread_function,
-                  void *thread_arg,
-                  lldb::SBError *err);
-
-    static bool
-    ThreadCancel (lldb::thread_t thread,
-                  lldb::SBError *err);
-
-    static bool
-    ThreadDetach (lldb::thread_t thread,
-                  lldb::SBError *err);
-    static bool
-    ThreadJoin (lldb::thread_t thread,
-                lldb::thread_result_t *result,
-                lldb::SBError *err);
-
-
-private:
-
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBHostOS_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBInstruction.h b/kcov-38/external/lldb/include/lldb/API/SBInstruction.h
deleted file mode 100644
index c4bded595761..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBInstruction.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//===-- SBInstruction.h -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBInstruction_h_
-#define LLDB_SBInstruction_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBData.h"
-
-#include <stdio.h>
-
-// There's a lot to be fixed here, but need to wait for underlying insn implementation
-// to be revised & settle down first.
-
-namespace lldb {
-
-class LLDB_API SBInstruction
-{
-public:
-
-    SBInstruction ();
-
-    SBInstruction (const SBInstruction &rhs);
-    
-    const SBInstruction &
-    operator = (const SBInstruction &rhs);
-
-    ~SBInstruction ();
-
-    bool
-    IsValid();
-
-    SBAddress
-    GetAddress();
-    
-    lldb::AddressClass
-    GetAddressClass ();
-    
-    const char *
-    GetMnemonic (lldb::SBTarget target);
-
-    const char *
-    GetOperands (lldb::SBTarget target);
-    
-    const char *
-    GetComment (lldb::SBTarget target);
-
-    lldb::SBData
-    GetData (lldb::SBTarget target);
-
-    size_t
-    GetByteSize ();
-
-    bool
-    DoesBranch ();
-
-    void
-    Print (FILE *out);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    bool
-    EmulateWithFrame (lldb::SBFrame &frame, uint32_t evaluate_options);
-
-    bool
-    DumpEmulation (const char * triple); // triple is to specify the architecture, e.g. 'armv6' or 'armv7-apple-ios'
-    
-    bool
-    TestEmulation (lldb::SBStream &output_stream, const char *test_file);
-
-protected:
-    friend class SBInstructionList;
-
-    SBInstruction (const lldb::InstructionSP &inst_sp);
-
-    void
-    SetOpaque (const lldb::InstructionSP &inst_sp);
-
-private:
-
-    lldb::InstructionSP  m_opaque_sp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBInstruction_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h b/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
deleted file mode 100644
index 8ef163796629..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBInstructionList.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//===-- SBInstructionList.h -------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBInstructionList_h_
-#define LLDB_SBInstructionList_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-
-namespace lldb {
-
-class LLDB_API SBInstructionList
-{
-public:
-
-    SBInstructionList ();
-
-    SBInstructionList (const SBInstructionList &rhs);
-    
-    const SBInstructionList &
-    operator = (const SBInstructionList &rhs);
-
-    ~SBInstructionList ();
-
-    bool
-    IsValid () const;
-
-    size_t
-    GetSize ();
-
-    lldb::SBInstruction
-    GetInstructionAtIndex (uint32_t idx);
-
-    void
-    Clear ();
-
-    void
-    AppendInstruction (lldb::SBInstruction inst);
-
-    void
-    Print (FILE *out);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-    
-    bool
-    DumpEmulationForAllInstructions (const char *triple);
-
-protected:
-    friend class SBFunction;
-    friend class SBSymbol;
-    friend class SBTarget;
-    
-    void
-    SetDisassembler (const lldb::DisassemblerSP &opaque_sp);
-
-private:    
-    lldb::DisassemblerSP m_opaque_sp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBInstructionList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h b/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
deleted file mode 100644
index 898604c496fa..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBLanguageRuntime.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===-- SBLanguageRuntime.h -------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBLanguageRuntime_h_
-#define LLDB_SBLanguageRuntime_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class SBLanguageRuntime
-{
-public:
-    static lldb::LanguageType
-    GetLanguageTypeFromString (const char *string);
-    
-    static const char *
-    GetNameForLanguageType (lldb::LanguageType language);
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBLanguageRuntime_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h b/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
deleted file mode 100644
index 68c0f386acde..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBLaunchInfo.h
+++ /dev/null
@@ -1,195 +0,0 @@
-//===-- SBLaunchInfo.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBLaunchInfo_h_
-#define LLDB_SBLaunchInfo_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class SBPlatform;
-class SBTarget;
-
-class LLDB_API SBLaunchInfo
-{
-public:
-    SBLaunchInfo (const char **argv);
-
-    ~SBLaunchInfo();
-
-    lldb::pid_t
-    GetProcessID();
-
-    uint32_t
-    GetUserID();
-
-    uint32_t
-    GetGroupID();
-
-    bool
-    UserIDIsValid ();
-
-    bool
-    GroupIDIsValid ();
-
-    void
-    SetUserID (uint32_t uid);
-
-    void
-    SetGroupID (uint32_t gid);
-
-    SBFileSpec
-    GetExecutableFile ();
-
-    //----------------------------------------------------------------------
-    /// Set the executable file that will be used to launch the process and
-    /// optionally set it as the first argument in the argument vector.
-    ///
-    /// This only needs to be specified if clients wish to carefully control
-    /// the exact path will be used to launch a binary. If you create a
-    /// target with a symlink, that symlink will get resolved in the target
-    /// and the resolved path will get used to launch the process. Calling
-    /// this function can help you still launch your process using the
-    /// path of your choice.
-    ///
-    /// If this function is not called prior to launching with
-    /// SBTarget::Launch(...), the target will use the resolved executable
-    /// path that was used to create the target.
-    ///
-    /// @param[in] exe_file
-    ///     The override path to use when launching the executable.
-    ///
-    /// @param[in] add_as_first_arg
-    ///     If true, then the path will be inserted into the argument vector
-    ///     prior to launching. Otherwise the argument vector will be left
-    ///     alone.
-    //----------------------------------------------------------------------
-    void
-    SetExecutableFile (SBFileSpec exe_file, bool add_as_first_arg);
-
-
-    //----------------------------------------------------------------------
-    /// Get the listener that will be used to receive process events.
-    ///
-    /// If no listener has been set via a call to
-    /// SBLaunchInfo::SetListener(), then an invalid SBListener will be
-    /// returned (SBListener::IsValid() will return false). If a listener
-    /// has been set, then the valid listener object will be returned.
-    //----------------------------------------------------------------------
-    SBListener
-    GetListener ();
-
-    //----------------------------------------------------------------------
-    /// Set the listener that will be used to receive process events.
-    ///
-    /// By default the SBDebugger, which has a listener, that the SBTarget
-    /// belongs to will listen for the process events. Calling this function
-    /// allows a different listener to be used to listen for process events.
-    //----------------------------------------------------------------------
-    void
-    SetListener (SBListener &listener);
-
-    uint32_t
-    GetNumArguments ();
-
-    const char *
-    GetArgumentAtIndex (uint32_t idx);
-
-    void
-    SetArguments (const char **argv, bool append);
-
-    uint32_t
-    GetNumEnvironmentEntries ();
-
-    const char *
-    GetEnvironmentEntryAtIndex (uint32_t idx);
-
-    void
-    SetEnvironmentEntries (const char **envp, bool append);
-
-    void
-    Clear ();
-
-    const char *
-    GetWorkingDirectory () const;
-
-    void
-    SetWorkingDirectory (const char *working_dir);
-
-    uint32_t
-    GetLaunchFlags ();
-
-    void
-    SetLaunchFlags (uint32_t flags);
-
-    const char *
-    GetProcessPluginName ();
-
-    void
-    SetProcessPluginName (const char *plugin_name);
-
-    const char *
-    GetShell ();
-
-    void
-    SetShell (const char * path);
-    
-    bool
-    GetShellExpandArguments ();
-    
-    void
-    SetShellExpandArguments (bool glob);
-    
-    uint32_t
-    GetResumeCount ();
-
-    void
-    SetResumeCount (uint32_t c);
-
-    bool
-    AddCloseFileAction (int fd);
-
-    bool
-    AddDuplicateFileAction (int fd, int dup_fd);
-
-    bool
-    AddOpenFileAction (int fd, const char *path, bool read, bool write);
-
-    bool
-    AddSuppressFileAction (int fd, bool read, bool write);
-
-    void
-    SetLaunchEventData (const char *data);
-
-    const char *
-    GetLaunchEventData () const;
-
-    bool
-    GetDetachOnError() const;
-
-    void
-    SetDetachOnError(bool enable);
-
-protected:
-    friend class SBPlatform;
-    friend class SBTarget;
-
-    lldb_private::ProcessLaunchInfo &
-    ref ();
-
-    const lldb_private::ProcessLaunchInfo &
-    ref () const;
-
-    ProcessLaunchInfoSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBLaunchInfo_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h b/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
deleted file mode 100644
index 8311bbbafc90..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBLineEntry.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//===-- SBLineEntry.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBLineEntry_h_
-#define LLDB_SBLineEntry_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-#include "lldb/API/SBFileSpec.h"
-
-namespace lldb {
-
-class LLDB_API SBLineEntry
-{
-public:
-
-    SBLineEntry ();
-
-    SBLineEntry (const lldb::SBLineEntry &rhs);
-
-    ~SBLineEntry ();
-
-    const lldb::SBLineEntry &
-    operator = (const lldb::SBLineEntry &rhs);
-
-    lldb::SBAddress
-    GetStartAddress () const;
-
-    lldb::SBAddress
-    GetEndAddress () const;
-
-    bool
-    IsValid () const;
-
-    lldb::SBFileSpec
-    GetFileSpec () const;
-
-    uint32_t
-    GetLine () const;
-
-    uint32_t
-    GetColumn () const;
-
-    void
-    SetFileSpec (lldb::SBFileSpec filespec);
-    
-    void
-    SetLine (uint32_t line);
-    
-    void
-    SetColumn (uint32_t column);
-
-    bool
-    operator == (const lldb::SBLineEntry &rhs) const;
-
-    bool
-    operator != (const lldb::SBLineEntry &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-protected:
-
-    lldb_private::LineEntry *
-    get ();
-    
-private:
-    friend class SBAddress;
-    friend class SBCompileUnit;
-    friend class SBFrame;
-    friend class SBSymbolContext;
-
-    const lldb_private::LineEntry *
-    operator->() const;
-
-    lldb_private::LineEntry &
-    ref();
-
-    const lldb_private::LineEntry &
-    ref() const;
-
-    SBLineEntry (const lldb_private::LineEntry *lldb_object_ptr);
-
-    void
-    SetLineEntry (const lldb_private::LineEntry &lldb_object_ref);
-
-    std::unique_ptr<lldb_private::LineEntry> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBLineEntry_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBListener.h b/kcov-38/external/lldb/include/lldb/API/SBListener.h
deleted file mode 100644
index 924f8109f638..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBListener.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//===-- SBListener.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBListener_h_
-#define LLDB_SBListener_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBListener
-{
-public:
-    SBListener ();
-
-    SBListener (const char *name);
-
-    SBListener (const SBListener &rhs);
-
-    ~SBListener ();
-
-    const lldb::SBListener &
-    operator = (const lldb::SBListener &rhs);
-
-    void
-    AddEvent (const lldb::SBEvent &event);
-
-    void
-    Clear ();
-
-    bool
-    IsValid () const;
-
-    uint32_t
-    StartListeningForEventClass (SBDebugger &debugger,
-                                 const char *broadcaster_class, 
-                                 uint32_t event_mask);
-                                 
-    bool
-    StopListeningForEventClass (SBDebugger &debugger,
-                                const char *broadcaster_class,
-                                uint32_t event_mask);
-    
-    uint32_t
-    StartListeningForEvents (const lldb::SBBroadcaster& broadcaster,
-                             uint32_t event_mask);
-
-    bool
-    StopListeningForEvents (const lldb::SBBroadcaster& broadcaster,
-                            uint32_t event_mask);
-
-    // Returns true if an event was received, false if we timed out.
-    bool
-    WaitForEvent (uint32_t num_seconds,
-                  lldb::SBEvent &event);
-
-    bool
-    WaitForEventForBroadcaster (uint32_t num_seconds,
-                                const lldb::SBBroadcaster &broadcaster,
-                                lldb::SBEvent &sb_event);
-
-    bool
-    WaitForEventForBroadcasterWithType (uint32_t num_seconds,
-                                        const lldb::SBBroadcaster &broadcaster,
-                                        uint32_t event_type_mask,
-                                        lldb::SBEvent &sb_event);
-
-    bool
-    PeekAtNextEvent (lldb::SBEvent &sb_event);
-
-    bool
-    PeekAtNextEventForBroadcaster (const lldb::SBBroadcaster &broadcaster,
-                                   lldb::SBEvent &sb_event);
-
-    bool
-    PeekAtNextEventForBroadcasterWithType (const lldb::SBBroadcaster &broadcaster,
-                                           uint32_t event_type_mask,
-                                           lldb::SBEvent &sb_event);
-
-    bool
-    GetNextEvent (lldb::SBEvent &sb_event);
-
-    bool
-    GetNextEventForBroadcaster (const lldb::SBBroadcaster &broadcaster,
-                                lldb::SBEvent &sb_event);
-
-    bool
-    GetNextEventForBroadcasterWithType (const lldb::SBBroadcaster &broadcaster,
-                                        uint32_t event_type_mask,
-                                        lldb::SBEvent &sb_event);
-
-    bool
-    HandleBroadcastEvent (const lldb::SBEvent &event);
-
-protected:
-    friend class SBAttachInfo;
-    friend class SBBroadcaster;
-    friend class SBCommandInterpreter;
-    friend class SBDebugger;
-    friend class SBLaunchInfo;
-    friend class SBTarget;
-
-    SBListener (lldb_private::Listener &listener);
-
-    SBListener (const lldb::ListenerSP &listener_sp);
-
-    lldb::ListenerSP
-    GetSP ()
-    {
-        return m_opaque_sp;
-    }
-
-private:
-
-    lldb_private::Listener *
-    operator->() const;
-
-    lldb_private::Listener *
-    get() const;
-
-    lldb_private::Listener &
-    ref() const;
-        
-    lldb_private::Listener &
-    operator *();
-
-    const lldb_private::Listener &
-    operator *() const;
-
-    void
-    reset(lldb_private::Listener *listener, bool transfer_ownership);
-
-    lldb::ListenerSP m_opaque_sp;
-    lldb_private::Listener *m_opaque_ptr;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBListener_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBModule.h b/kcov-38/external/lldb/include/lldb/API/SBModule.h
deleted file mode 100644
index 4030d2b21797..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBModule.h
+++ /dev/null
@@ -1,359 +0,0 @@
-//===-- SBModule.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBModule_h_
-#define LLDB_SBModule_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBError.h"
-#include "lldb/API/SBSection.h"
-#include "lldb/API/SBSymbolContext.h"
-#include "lldb/API/SBValueList.h"
-
-namespace lldb {
-
-class LLDB_API SBModule
-{
-public:
-
-    SBModule ();
-
-    SBModule (const SBModule &rhs);
-
-    SBModule (const SBModuleSpec &module_spec);
-
-    const SBModule &
-    operator = (const SBModule &rhs);
-
-    SBModule (lldb::SBProcess &process, 
-              lldb::addr_t header_addr);
-
-    ~SBModule ();
-
-    bool
-    IsValid () const;
-
-    void
-    Clear();
-
-    //------------------------------------------------------------------
-    /// Get const accessor for the module file specification.
-    ///
-    /// This function returns the file for the module on the host system
-    /// that is running LLDB. This can differ from the path on the 
-    /// platform since we might be doing remote debugging.
-    ///
-    /// @return
-    ///     A const reference to the file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetFileSpec () const;
-
-    //------------------------------------------------------------------
-    /// Get accessor for the module platform file specification.
-    ///
-    /// Platform file refers to the path of the module as it is known on
-    /// the remote system on which it is being debugged. For local 
-    /// debugging this is always the same as Module::GetFileSpec(). But
-    /// remote debugging might mention a file '/usr/lib/liba.dylib'
-    /// which might be locally downloaded and cached. In this case the
-    /// platform file could be something like:
-    /// '/tmp/lldb/platform-cache/remote.host.computer/usr/lib/liba.dylib'
-    /// The file could also be cached in a local developer kit directory.
-    ///
-    /// @return
-    ///     A const reference to the file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetPlatformFileSpec () const;
-
-    bool
-    SetPlatformFileSpec (const lldb::SBFileSpec &platform_file);
-
-    //------------------------------------------------------------------
-    /// Get accessor for the remote install path for a module.
-    ///
-    /// When debugging to a remote platform by connecting to a remote
-    /// platform, the install path of the module can be set. If the
-    /// install path is set, every time the process is about to launch
-    /// the target will install this module on the remote platform prior
-    /// to launching.
-    ///
-    /// @return
-    ///     A file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetRemoteInstallFileSpec ();
-    
-    //------------------------------------------------------------------
-    /// Set accessor for the remote install path for a module.
-    ///
-    /// When debugging to a remote platform by connecting to a remote
-    /// platform, the install path of the module can be set. If the
-    /// install path is set, every time the process is about to launch
-    /// the target will install this module on the remote platform prior
-    /// to launching.
-    ///
-    /// If \a file specifies a full path to an install location, the
-    /// module will be installed to this path. If the path is relative
-    /// (no directory specified, or the path is partial like "usr/lib"
-    /// or "./usr/lib", then the install path will be resolved using
-    /// the platform's current working directory as the base path.
-    ///
-    /// @param[in] file
-    ///     A file specification object.
-    //------------------------------------------------------------------
-    bool
-    SetRemoteInstallFileSpec (lldb::SBFileSpec &file);
-    
-    lldb::ByteOrder
-    GetByteOrder ();
-    
-    uint32_t
-    GetAddressByteSize();
-    
-    const char *
-    GetTriple ();
-
-    const uint8_t *
-    GetUUIDBytes () const;
-
-    const char *
-    GetUUIDString () const;
-
-    bool
-    operator == (const lldb::SBModule &rhs) const;
-
-    bool
-    operator != (const lldb::SBModule &rhs) const;
-
-    lldb::SBSection
-    FindSection (const char *sect_name);
-
-    lldb::SBAddress
-    ResolveFileAddress (lldb::addr_t vm_addr);
-
-    lldb::SBSymbolContext
-    ResolveSymbolContextForAddress (const lldb::SBAddress& addr, 
-                                    uint32_t resolve_scope);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    uint32_t
-    GetNumCompileUnits();
-
-    lldb::SBCompileUnit
-    GetCompileUnitAtIndex (uint32_t);
-
-    size_t
-    GetNumSymbols ();
-    
-    lldb::SBSymbol
-    GetSymbolAtIndex (size_t idx);
-
-    lldb::SBSymbol
-    FindSymbol (const char *name,
-                lldb::SymbolType type = eSymbolTypeAny);
-
-    lldb::SBSymbolContextList
-    FindSymbols (const char *name,
-                 lldb::SymbolType type = eSymbolTypeAny);
-
-    size_t
-    GetNumSections ();
-    
-    lldb::SBSection
-    GetSectionAtIndex (size_t idx);
-    //------------------------------------------------------------------
-    /// Find functions by name.
-    ///
-    /// @param[in] name
-    ///     The name of the function we are looking for.
-    ///
-    /// @param[in] name_type_mask
-    ///     A logical OR of one or more FunctionNameType enum bits that
-    ///     indicate what kind of names should be used when doing the
-    ///     lookup. Bits include fully qualified names, base names,
-    ///     C++ methods, or ObjC selectors. 
-    ///     See FunctionNameType for more details.
-    ///
-    /// @return
-    ///     A lldb::SBSymbolContextList that gets filled in with all of 
-    ///     the symbol contexts for all the matches.
-    //------------------------------------------------------------------
-    lldb::SBSymbolContextList
-    FindFunctions (const char *name, 
-                   uint32_t name_type_mask = lldb::eFunctionNameTypeAny);
-
-    //------------------------------------------------------------------
-    /// Find global and static variables by name.
-    ///
-    /// @param[in] target
-    ///     A valid SBTarget instance representing the debuggee.
-    ///
-    /// @param[in] name
-    ///     The name of the global or static variable we are looking
-    ///     for.
-    ///
-    /// @param[in] max_matches
-    ///     Allow the number of matches to be limited to \a max_matches.
-    ///
-    /// @return
-    ///     A list of matched variables in an SBValueList.
-    //------------------------------------------------------------------
-    lldb::SBValueList
-    FindGlobalVariables (lldb::SBTarget &target, 
-                         const char *name, 
-                         uint32_t max_matches);
-    
-    //------------------------------------------------------------------
-    /// Find the first global (or static) variable by name.
-    ///
-    /// @param[in] target
-    ///     A valid SBTarget instance representing the debuggee.
-    ///
-    /// @param[in] name
-    ///     The name of the global or static variable we are looking
-    ///     for.
-    ///
-    /// @return
-    ///     An SBValue that gets filled in with the found variable (if any).
-    //------------------------------------------------------------------
-    lldb::SBValue
-    FindFirstGlobalVariable (lldb::SBTarget &target, const char *name);
-    
-    lldb::SBType
-    FindFirstType (const char* name);
-    
-    lldb::SBTypeList
-    FindTypes (const char* type);
-    
-    //------------------------------------------------------------------
-    /// Get a type using its type ID.
-    ///
-    /// Each symbol file reader will assign different user IDs to their
-    /// types, but it is sometimes useful when debugging type issues to
-    /// be able to grab a type using its type ID.
-    ///
-    /// For DWARF debug info, the type ID is the DIE offset.
-    ///
-    /// @param[in] uid
-    ///     The type user ID.
-    ///
-    /// @return
-    ///     An SBType for the given type ID, or an empty SBType if the
-    ///     type was not found.
-    //------------------------------------------------------------------
-    lldb::SBType
-    GetTypeByID (lldb::user_id_t uid);
-
-    lldb::SBType
-    GetBasicType(lldb::BasicType type);
-
-    //------------------------------------------------------------------
-    /// Get all types matching \a type_mask from debug info in this
-    /// module.
-    ///
-    /// @param[in] type_mask
-    ///     A bitfield that consists of one or more bits logically OR'ed
-    ///     together from the lldb::TypeClass enumeration. This allows
-    ///     you to request only structure types, or only class, struct
-    ///     and union types. Passing in lldb::eTypeClassAny will return
-    ///     all types found in the debug information for this module.
-    ///
-    /// @return
-    ///     A list of types in this module that match \a type_mask
-    //------------------------------------------------------------------
-    lldb::SBTypeList
-    GetTypes (uint32_t type_mask = lldb::eTypeClassAny);
-
-    //------------------------------------------------------------------
-    /// Get the module version numbers.
-    ///
-    /// Many object files have a set of version numbers that describe
-    /// the version of the executable or shared library. Typically there
-    /// are major, minor and build, but there may be more. This function
-    /// will extract the versions from object files if they are available.
-    ///
-    /// If \a versions is NULL, or if \a num_versions is 0, the return
-    /// value will indicate how many version numbers are available in
-    /// this object file. Then a subsequent call can be made to this 
-    /// function with a value of \a versions and \a num_versions that
-    /// has enough storage to store some or all version numbers.
-    ///
-    /// @param[out] versions
-    ///     A pointer to an array of uint32_t types that is \a num_versions
-    ///     long. If this value is NULL, the return value will indicate
-    ///     how many version numbers are required for a subsequent call
-    ///     to this function so that all versions can be retrieved. If
-    ///     the value is non-NULL, then at most \a num_versions of the
-    ///     existing versions numbers will be filled into \a versions.
-    ///     If there is no version information available, \a versions
-    ///     will be filled with \a num_versions UINT32_MAX values
-    ///     and zero will be returned.
-    ///
-    /// @param[in] num_versions
-    ///     The maximum number of entries to fill into \a versions. If
-    ///     this value is zero, then the return value will indicate
-    ///     how many version numbers there are in total so another call
-    ///     to this function can be make with adequate storage in
-    ///     \a versions to get all of the version numbers. If \a
-    ///     num_versions is less than the actual number of version 
-    ///     numbers in this object file, only \a num_versions will be
-    ///     filled into \a versions (if \a versions is non-NULL).
-    ///
-    /// @return
-    ///     This function always returns the number of version numbers
-    ///     that this object file has regardless of the number of
-    ///     version numbers that were copied into \a versions. 
-    //------------------------------------------------------------------
-    uint32_t
-    GetVersion (uint32_t *versions, 
-                uint32_t num_versions);
-
-    //------------------------------------------------------------------
-    /// Get accessor for the symbol file specification.
-    ///
-    /// When debugging an object file an additional debug information can
-    /// be provided in separate file. Therefore if you debugging something
-    /// like '/usr/lib/liba.dylib' then debug information can be located
-    /// in folder like '/usr/lib/liba.dylib.dSYM/'.
-    ///
-    /// @return
-    ///     A const reference to the file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetSymbolFileSpec() const;
-
-    lldb::SBAddress
-    GetObjectFileHeaderAddress() const;
-
-private:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBSection;
-    friend class SBSymbolContext;
-    friend class SBTarget;
-
-    explicit SBModule (const lldb::ModuleSP& module_sp);
-
-    ModuleSP
-    GetSP () const;
-    
-    void
-    SetSP (const ModuleSP &module_sp);
-
-    lldb::ModuleSP m_opaque_sp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBModule_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h b/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
deleted file mode 100644
index d533de3c7bce..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBModuleSpec.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//===-- SBModuleSpec.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBModuleSpec_h_
-#define LLDB_SBModuleSpec_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBFileSpec.h"
-
-namespace lldb {
-
-class LLDB_API SBModuleSpec
-{
-public:
-
-    SBModuleSpec ();
-
-    SBModuleSpec (const SBModuleSpec &rhs);
-
-    ~SBModuleSpec ();
-
-    const SBModuleSpec &
-    operator = (const SBModuleSpec &rhs);
-
-    bool
-    IsValid () const;
-
-    void
-    Clear();
-
-    //------------------------------------------------------------------
-    /// Get const accessor for the module file.
-    ///
-    /// This function returns the file for the module on the host system
-    /// that is running LLDB. This can differ from the path on the 
-    /// platform since we might be doing remote debugging.
-    ///
-    /// @return
-    ///     A const reference to the file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetFileSpec ();
-
-    void
-    SetFileSpec (const lldb::SBFileSpec &fspec);
-
-    //------------------------------------------------------------------
-    /// Get accessor for the module platform file.
-    ///
-    /// Platform file refers to the path of the module as it is known on
-    /// the remote system on which it is being debugged. For local 
-    /// debugging this is always the same as Module::GetFileSpec(). But
-    /// remote debugging might mention a file '/usr/lib/liba.dylib'
-    /// which might be locally downloaded and cached. In this case the
-    /// platform file could be something like:
-    /// '/tmp/lldb/platform-cache/remote.host.computer/usr/lib/liba.dylib'
-    /// The file could also be cached in a local developer kit directory.
-    ///
-    /// @return
-    ///     A const reference to the file specification object.
-    //------------------------------------------------------------------
-    lldb::SBFileSpec
-    GetPlatformFileSpec ();
-
-    void
-    SetPlatformFileSpec (const lldb::SBFileSpec &fspec);
-
-    lldb::SBFileSpec
-    GetSymbolFileSpec ();
-    
-    void
-    SetSymbolFileSpec (const lldb::SBFileSpec &fspec);
-
-    const char *
-    GetObjectName ();
-    
-    void
-    SetObjectName (const char *name);
-
-    const char *
-    GetTriple ();
-
-    void
-    SetTriple (const char *triple);
-
-    const uint8_t *
-    GetUUIDBytes ();
-
-    size_t
-    GetUUIDLength ();
-
-    bool
-    SetUUIDBytes (const uint8_t *uuid, size_t uuid_len);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-    
-private:
-    friend class SBModuleSpecList;
-    friend class SBModule;
-    friend class SBTarget;
-
-    std::unique_ptr<lldb_private::ModuleSpec> m_opaque_ap;
-};
-
-class SBModuleSpecList
-{
-public:
-    SBModuleSpecList();
-
-    SBModuleSpecList (const SBModuleSpecList &rhs);
-
-    ~SBModuleSpecList();
-
-    SBModuleSpecList &
-    operator = (const SBModuleSpecList &rhs);
-    
-    static SBModuleSpecList
-    GetModuleSpecifications (const char *path);
-    
-    void
-    Append (const SBModuleSpec &spec);
-    
-    void
-    Append (const SBModuleSpecList &spec_list);
-
-    SBModuleSpec
-    FindFirstMatchingSpec (const SBModuleSpec &match_spec);
-
-    SBModuleSpecList
-    FindMatchingSpecs (const SBModuleSpec &match_spec);
-
-    size_t
-    GetSize();
-    
-    SBModuleSpec
-    GetSpecAtIndex (size_t i);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-    
-private:
-    std::unique_ptr<lldb_private::ModuleSpecList> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBModuleSpec_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBPlatform.h b/kcov-38/external/lldb/include/lldb/API/SBPlatform.h
deleted file mode 100644
index db4a754103ca..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBPlatform.h
+++ /dev/null
@@ -1,211 +0,0 @@
-//===-- SBPlatform.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBPlatform_h_
-#define LLDB_SBPlatform_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <functional>
-
-struct PlatformConnectOptions;
-struct PlatformShellCommand;
-
-namespace lldb {
-
-    class SBLaunchInfo;
-
-    class LLDB_API SBPlatformConnectOptions
-    {
-    public:
-        SBPlatformConnectOptions (const char *url);
-
-        SBPlatformConnectOptions (const SBPlatformConnectOptions &rhs);
-
-        ~SBPlatformConnectOptions ();
-        
-        void
-        operator=(const SBPlatformConnectOptions &rhs);
-
-        const char *
-        GetURL();
-        
-        void
-        SetURL(const char *url);
-        
-        bool
-        GetRsyncEnabled();
-        
-        void
-        EnableRsync (const char *options,
-                     const char *remote_path_prefix,
-                     bool omit_remote_hostname);
-                     
-        void
-        DisableRsync ();
-        
-        const char *
-        GetLocalCacheDirectory();
-
-        void
-        SetLocalCacheDirectory(const char *path);
-    protected:
-        PlatformConnectOptions *m_opaque_ptr;
-    };
-
-    class LLDB_API SBPlatformShellCommand
-    {
-    public:
-        SBPlatformShellCommand (const char *shell_command);
-        
-        SBPlatformShellCommand (const SBPlatformShellCommand &rhs);
-        
-        ~SBPlatformShellCommand();
-        
-        void
-        Clear();
-
-        const char *
-        GetCommand();
-
-        void
-        SetCommand(const char *shell_command);
-        
-        const char *
-        GetWorkingDirectory ();
-
-        void
-        SetWorkingDirectory (const char *path);
-
-        uint32_t
-        GetTimeoutSeconds ();
-        
-        void
-        SetTimeoutSeconds (uint32_t sec);
-        
-        int
-        GetSignal ();
-        
-        int
-        GetStatus ();
-        
-        const char *
-        GetOutput ();
-
-    protected:
-        friend class SBPlatform;
-
-        PlatformShellCommand *m_opaque_ptr;
-    };
-
-    class LLDB_API SBPlatform
-    {
-    public:
-        
-        SBPlatform ();
-        
-        SBPlatform (const char *platform_name);
-        
-        ~SBPlatform();
-        
-        bool
-        IsValid () const;
-        
-        void
-        Clear ();
-
-        const char *
-        GetWorkingDirectory();
-
-        bool
-        SetWorkingDirectory(const char *path);
-
-        const char *
-        GetName ();
-
-        SBError
-        ConnectRemote (SBPlatformConnectOptions &connect_options);
-
-        void
-        DisconnectRemote ();
-        
-        bool
-        IsConnected();
-
-        //----------------------------------------------------------------------
-        // The following functions will work if the platform is connected
-        //----------------------------------------------------------------------
-        const char *
-        GetTriple();
-
-        const char *
-        GetHostname ();
-        
-        const char *
-        GetOSBuild ();
-        
-        const char *
-        GetOSDescription ();
-
-        uint32_t
-        GetOSMajorVersion ();
-
-        uint32_t
-        GetOSMinorVersion ();
-
-        uint32_t
-        GetOSUpdateVersion ();
-
-        SBError
-        Put (SBFileSpec &src, SBFileSpec &dst);
-        
-        SBError
-        Get (SBFileSpec &src, SBFileSpec &dst);
-
-        SBError
-        Install (SBFileSpec& src, SBFileSpec& dst);
-
-        SBError
-        Run (SBPlatformShellCommand &shell_command);
-
-        SBError
-        Launch (SBLaunchInfo &launch_info);
-
-        SBError
-        Kill (const lldb::pid_t pid);
-
-        SBError
-        MakeDirectory (const char *path, uint32_t file_permissions = eFilePermissionsDirectoryDefault);
-
-        uint32_t
-        GetFilePermissions (const char *path);
-        
-        SBError
-        SetFilePermissions (const char *path, uint32_t file_permissions);
-
-    protected:
-        
-        friend class SBDebugger;
-        friend class SBTarget;
-
-        lldb::PlatformSP
-        GetSP () const;
-        
-        void
-        SetSP (const lldb::PlatformSP& platform_sp);
-
-        SBError
-        ExecuteConnected (const std::function<lldb_private::Error(const lldb::PlatformSP&)>& func);
-
-        lldb::PlatformSP m_opaque_sp;
-    };
-
-} // namespace lldb
-
-#endif // LLDB_SBPlatform_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBProcess.h b/kcov-38/external/lldb/include/lldb/API/SBProcess.h
deleted file mode 100644
index 71bca4fc697a..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBProcess.h
+++ /dev/null
@@ -1,369 +0,0 @@
-//===-- SBProcess.h ---------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBProcess_h_
-#define LLDB_SBProcess_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBError.h"
-#include "lldb/API/SBTarget.h"
-#include "lldb/API/SBQueue.h"
-#include <stdio.h>
-
-namespace lldb {
-
-class SBEvent;
-
-class LLDB_API SBProcess
-{
-public:
-    //------------------------------------------------------------------
-    /// Broadcaster event bits definitions.
-    //------------------------------------------------------------------
-    FLAGS_ANONYMOUS_ENUM()
-    {
-        eBroadcastBitStateChanged   = (1 << 0),
-        eBroadcastBitInterrupt      = (1 << 1),
-        eBroadcastBitSTDOUT         = (1 << 2),
-        eBroadcastBitSTDERR         = (1 << 3),
-        eBroadcastBitProfileData    = (1 << 4)
-    };
-
-    SBProcess ();
-
-    SBProcess (const lldb::SBProcess& rhs);
-
-    const lldb::SBProcess&
-    operator = (const lldb::SBProcess& rhs);
-
-    SBProcess (const lldb::ProcessSP &process_sp);
-    
-    ~SBProcess();
-
-    static const char *
-    GetBroadcasterClassName ();
-    
-    const char *
-    GetPluginName ();
-    
-    // DEPRECATED: use GetPluginName()
-    const char *
-    GetShortPluginName ();
-    
-    void
-    Clear ();
-
-    bool
-    IsValid() const;
-
-    lldb::SBTarget
-    GetTarget() const;
-
-    lldb::ByteOrder
-    GetByteOrder() const;
-
-    size_t
-    PutSTDIN (const char *src, size_t src_len);
-
-    size_t
-    GetSTDOUT (char *dst, size_t dst_len) const;
-
-    size_t
-    GetSTDERR (char *dst, size_t dst_len) const;
-
-    size_t
-    GetAsyncProfileData(char *dst, size_t dst_len) const;
-    
-    void
-    ReportEventState (const lldb::SBEvent &event, FILE *out) const;
-
-    void
-    AppendEventStateReport (const lldb::SBEvent &event, lldb::SBCommandReturnObject &result);
-
-    //------------------------------------------------------------------
-    /// Remote connection related functions. These will fail if the
-    /// process is not in eStateConnected. They are intended for use
-    /// when connecting to an externally managed debugserver instance.
-    //------------------------------------------------------------------
-    bool
-    RemoteAttachToProcessWithID (lldb::pid_t pid,
-                                 lldb::SBError& error);
-    
-    bool
-    RemoteLaunch (char const **argv,
-                  char const **envp,
-                  const char *stdin_path,
-                  const char *stdout_path,
-                  const char *stderr_path,
-                  const char *working_directory,
-                  uint32_t launch_flags,
-                  bool stop_at_entry,
-                  lldb::SBError& error);
-    
-    //------------------------------------------------------------------
-    // Thread related functions
-    //------------------------------------------------------------------
-    uint32_t
-    GetNumThreads ();
-
-    lldb::SBThread
-    GetThreadAtIndex (size_t index);
-
-    lldb::SBThread
-    GetThreadByID (lldb::tid_t sb_thread_id);
-
-    lldb::SBThread
-    GetThreadByIndexID (uint32_t index_id);
-
-    lldb::SBThread
-    GetSelectedThread () const;
-
-    //------------------------------------------------------------------
-    // Function for lazily creating a thread using the current OS
-    // plug-in. This function will be removed in the future when there
-    // are APIs to create SBThread objects through the interface and add
-    // them to the process through the SBProcess API.
-    //------------------------------------------------------------------
-    lldb::SBThread
-    CreateOSPluginThread (lldb::tid_t tid, lldb::addr_t context);
-
-    bool
-    SetSelectedThread (const lldb::SBThread &thread);
-
-    bool
-    SetSelectedThreadByID (lldb::tid_t tid);
-    
-    bool
-    SetSelectedThreadByIndexID (uint32_t index_id);
-
-    //------------------------------------------------------------------
-    // Queue related functions
-    //------------------------------------------------------------------
-    uint32_t
-    GetNumQueues ();
-
-    lldb::SBQueue
-    GetQueueAtIndex (size_t index);
-
-    //------------------------------------------------------------------
-    // Stepping related functions
-    //------------------------------------------------------------------
-
-    lldb::StateType
-    GetState ();
-
-    int
-    GetExitStatus ();
-
-    const char *
-    GetExitDescription ();
-
-    //------------------------------------------------------------------
-    /// Gets the process ID
-    ///
-    /// Returns the process identifier for the process as it is known
-    /// on the system on which the process is running. For unix systems
-    /// this is typically the same as if you called "getpid()" in the
-    /// process.
-    ///
-    /// @return
-    ///     Returns LLDB_INVALID_PROCESS_ID if this object does not
-    ///     contain a valid process object, or if the process has not
-    ///     been launched. Returns a valid process ID if the process is
-    ///     valid.
-    //------------------------------------------------------------------
-    lldb::pid_t
-    GetProcessID ();
-
-    //------------------------------------------------------------------
-    /// Gets the unique ID associated with this process object
-    ///
-    /// Unique IDs start at 1 and increment up with each new process
-    /// instance. Since starting a process on a system might always
-    /// create a process with the same process ID, there needs to be a
-    /// way to tell two process instances apart.
-    ///
-    /// @return
-    ///     Returns a non-zero integer ID if this object contains a
-    ///     valid process object, zero if this object does not contain
-    ///     a valid process object.
-    //------------------------------------------------------------------
-    uint32_t
-    GetUniqueID();
-
-    uint32_t
-    GetAddressByteSize() const;
-
-    lldb::SBError
-    Destroy ();
-
-    lldb::SBError
-    Continue ();
-
-    lldb::SBError
-    Stop ();
-
-    lldb::SBError
-    Kill ();
-
-    lldb::SBError
-    Detach ();
-
-    lldb::SBError
-    Detach (bool keep_stopped);
-
-    lldb::SBError
-    Signal (int signal);
-
-    lldb::SBUnixSignals
-    GetUnixSignals();
-
-    void
-    SendAsyncInterrupt();
-    
-    uint32_t
-    GetStopID(bool include_expression_stops = false);
-
-    //------------------------------------------------------------------
-    /// Gets the stop event corresponding to stop ID.
-    //
-    /// Note that it wasn't fully implemented and tracks only the stop
-    /// event for the last natural stop ID.
-    ///
-    /// @param [in] stop_id
-    ///   The ID of the stop event to return.
-    ///
-    /// @return
-    ///   The stop event corresponding to stop ID.
-    //------------------------------------------------------------------
-    lldb::SBEvent
-    GetStopEventForStopID(uint32_t stop_id);
-
-    size_t
-    ReadMemory (addr_t addr, void *buf, size_t size, lldb::SBError &error);
-
-    size_t
-    WriteMemory (addr_t addr, const void *buf, size_t size, lldb::SBError &error);
-
-    size_t
-    ReadCStringFromMemory (addr_t addr, void *buf, size_t size, lldb::SBError &error);
-
-    uint64_t
-    ReadUnsignedFromMemory (addr_t addr, uint32_t byte_size, lldb::SBError &error);
-
-    lldb::addr_t
-    ReadPointerFromMemory (addr_t addr, lldb::SBError &error);
-
-    // Events
-    static lldb::StateType
-    GetStateFromEvent (const lldb::SBEvent &event);
-
-    static bool
-    GetRestartedFromEvent (const lldb::SBEvent &event);
-    
-    static size_t
-    GetNumRestartedReasonsFromEvent (const lldb::SBEvent &event);
-    
-    static const char *
-    GetRestartedReasonAtIndexFromEvent (const lldb::SBEvent &event, size_t idx);
-
-    static lldb::SBProcess
-    GetProcessFromEvent (const lldb::SBEvent &event);
-
-    static bool
-    GetInterruptedFromEvent (const lldb::SBEvent &event);
-    
-    static bool
-    EventIsProcessEvent (const lldb::SBEvent &event);
-
-    lldb::SBBroadcaster
-    GetBroadcaster () const;
-
-    static const char *
-    GetBroadcasterClass ();
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    uint32_t
-    GetNumSupportedHardwareWatchpoints (lldb::SBError &error) const;
-
-    uint32_t
-    LoadImage (lldb::SBFileSpec &image_spec, lldb::SBError &error);
-    
-    lldb::SBError
-    UnloadImage (uint32_t image_token);
-    
-    lldb::SBError
-    SendEventData (const char *data);
-    
-    //------------------------------------------------------------------
-    /// Return the number of different thread-origin extended backtraces
-    /// this process can support.
-    ///
-    /// When the process is stopped and you have an SBThread, lldb may be
-    /// able to show a backtrace of when that thread was originally created,
-    /// or the work item was enqueued to it (in the case of a libdispatch 
-    /// queue).
-    ///
-    /// @return
-    ///   The number of thread-origin extended backtrace types that may be
-    ///   available.
-    //------------------------------------------------------------------
-    uint32_t
-    GetNumExtendedBacktraceTypes ();
-
-    //------------------------------------------------------------------
-    /// Return the name of one of the thread-origin extended backtrace 
-    /// methods.
-    ///
-    /// @param [in] idx
-    ///   The index of the name to return.  They will be returned in
-    ///   the order that the user will most likely want to see them.
-    ///   e.g. if the type at index 0 is not available for a thread, 
-    ///   see if the type at index 1 provides an extended backtrace.
-    ///
-    /// @return
-    ///   The name at that index.
-    //------------------------------------------------------------------
-    const char *
-    GetExtendedBacktraceTypeAtIndex (uint32_t idx);
-    
-    lldb::SBThreadCollection
-    GetHistoryThreads (addr_t addr);
-    
-    bool
-    IsInstrumentationRuntimePresent(InstrumentationRuntimeType type);
-
-protected:
-    friend class SBAddress;
-    friend class SBBreakpoint;
-    friend class SBBreakpointLocation;
-    friend class SBCommandInterpreter;
-    friend class SBDebugger;
-    friend class SBExecutionContext;
-    friend class SBFunction;
-    friend class SBModule;
-    friend class SBTarget;
-    friend class SBThread;
-    friend class SBValue;
-    friend class lldb_private::QueueImpl;
-
-    lldb::ProcessSP
-    GetSP() const;
-    
-    void
-    SetSP (const lldb::ProcessSP &process_sp);
-
-    lldb::ProcessWP m_opaque_wp;
-};
-
-}  // namespace lldb
-
-#endif  // LLDB_SBProcess_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBQueue.h b/kcov-38/external/lldb/include/lldb/API/SBQueue.h
deleted file mode 100644
index 2f453cddd5d1..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBQueue.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//===-- SBQueue.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBQueue_h_
-#define LLDB_SBQueue_h_
-
-#include <vector>
-
-#include "lldb/lldb-forward.h"
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBQueue
-{
-public:
-    SBQueue ();
-
-    SBQueue (const QueueSP& queue_sp);
-    
-    SBQueue (const SBQueue& rhs);
-
-    const SBQueue &
-    operator= (const lldb::SBQueue& rhs);
-
-   ~SBQueue();
-
-    bool
-    IsValid() const;
-
-    void
-    Clear ();
-
-    lldb::SBProcess
-    GetProcess ();
-
-    lldb::queue_id_t
-    GetQueueID () const;
-
-    const char *
-    GetName () const;
-
-    uint32_t
-    GetIndexID () const;
-
-    uint32_t
-    GetNumThreads ();
-
-    lldb::SBThread
-    GetThreadAtIndex (uint32_t);
-
-    uint32_t
-    GetNumPendingItems ();
-
-    lldb::SBQueueItem
-    GetPendingItemAtIndex (uint32_t);
-
-    uint32_t
-    GetNumRunningItems ();
-
-    lldb::QueueKind
-    GetKind ();
-
-protected:
-    friend class SBProcess;
-    friend class SBThread;
-
-    void
-    SetQueue (const lldb::QueueSP& queue_sp);
-
-    void
-    FetchThreads ();
-
-    void
-    FetchItems ();
-
-private:
-    std::shared_ptr<lldb_private::QueueImpl> m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBQueue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h b/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
deleted file mode 100644
index 9426a53b2376..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBQueueItem.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===-- SBQueueItem.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBQueueItem_h_
-#define LLDB_SBQueueItem_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-
-namespace lldb {
-
-class LLDB_API SBQueueItem
-{
-public:
-    SBQueueItem ();
-
-    SBQueueItem (const lldb::QueueItemSP& queue_item_sp);
-    
-   ~SBQueueItem();
-
-    bool
-    IsValid() const;
-
-    void
-    Clear ();
-
-    lldb::QueueItemKind
-    GetKind () const;
-
-    void
-    SetKind (lldb::QueueItemKind kind);
-
-    lldb::SBAddress
-    GetAddress () const;
-
-    void
-    SetAddress (lldb::SBAddress addr);
-
-    void
-    SetQueueItem (const lldb::QueueItemSP& queue_item_sp);
-
-    SBThread
-    GetExtendedBacktraceThread (const char *type);
-
-private:
-    lldb::QueueItemSP           m_queue_item_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBQueueItem_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSection.h b/kcov-38/external/lldb/include/lldb/API/SBSection.h
deleted file mode 100644
index 0a22413b5b9c..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBSection.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//===-- SBSection.h ---------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBSection_h_
-#define LLDB_SBSection_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBData.h"
-
-namespace lldb {
-
-class LLDB_API SBSection
-{
-public:
-
-    SBSection ();
-
-    SBSection (const lldb::SBSection &rhs);
-
-    ~SBSection ();
-
-    const lldb::SBSection &
-    operator = (const lldb::SBSection &rhs);
-
-    bool
-    IsValid () const;
-
-    const char *
-    GetName ();
-
-    lldb::SBSection
-    GetParent();
-
-    lldb::SBSection
-    FindSubSection (const char *sect_name);
-
-    size_t
-    GetNumSubSections ();
-
-    lldb::SBSection
-    GetSubSectionAtIndex (size_t idx);
-
-    lldb::addr_t
-    GetFileAddress ();
-
-    lldb::addr_t
-    GetLoadAddress (lldb::SBTarget &target);
-    
-    lldb::addr_t
-    GetByteSize ();
-
-    uint64_t
-    GetFileOffset ();
-
-    uint64_t
-    GetFileByteSize ();
-    
-    lldb::SBData
-    GetSectionData ();
-
-    lldb::SBData
-    GetSectionData (uint64_t offset,
-                    uint64_t size);
-    
-    SectionType
-    GetSectionType ();
-
-    //------------------------------------------------------------------
-    /// Return the size of a target's byte represented by this section
-    /// in numbers of host bytes. Note that certain architectures have
-    /// varying minimum addressable unit (i.e. byte) size for their 
-    /// CODE or DATA buses.
-    ///
-    /// @return
-    ///     The number of host (8-bit) bytes needed to hold a target byte
-    //------------------------------------------------------------------
-    uint32_t
-    GetTargetByteSize ();
-
-    bool
-    operator == (const lldb::SBSection &rhs);
-
-    bool
-    operator != (const lldb::SBSection &rhs);
-
-    bool
-    GetDescription (lldb::SBStream &description);
-    
-
-private:
-
-    friend class SBAddress;
-    friend class SBModule;
-    friend class SBTarget;
-    
-    SBSection (const lldb::SectionSP &section_sp);
-
-    lldb::SectionSP
-    GetSP() const;
-    
-    void
-    SetSP(const lldb::SectionSP &section_sp);
-    
-    lldb::SectionWP m_opaque_wp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBSection_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h b/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
deleted file mode 100644
index 6e7358f16e77..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBSourceManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- SBSourceManager.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBSourceManager_h_
-#define LLDB_SBSourceManager_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-
-namespace lldb {
-
-class LLDB_API SBSourceManager
-{
-public:
-    SBSourceManager (const SBDebugger &debugger);
-    SBSourceManager (const SBTarget &target);
-    SBSourceManager (const SBSourceManager &rhs);
-    
-    ~SBSourceManager();
-
-    const lldb::SBSourceManager &
-    operator = (const lldb::SBSourceManager &rhs);
-
-    size_t
-    DisplaySourceLinesWithLineNumbers (const lldb::SBFileSpec &file,
-                                       uint32_t line,
-                                       uint32_t context_before,
-                                       uint32_t context_after,
-                                       const char* current_line_cstr,
-                                       lldb::SBStream &s);
-
-
-protected:
-    friend class SBCommandInterpreter;
-    friend class SBDebugger;
-
-    SBSourceManager(lldb_private::SourceManager *source_manager);
-
-private:
-
-    std::unique_ptr<lldb_private::SourceManagerImpl> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBSourceManager_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBStream.h b/kcov-38/external/lldb/include/lldb/API/SBStream.h
deleted file mode 100644
index 2b25cd2c68f2..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBStream.h
+++ /dev/null
@@ -1,114 +0,0 @@
-//===-- SBStream.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBStream_h_
-#define LLDB_SBStream_h_
-
-#include <stdio.h>
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBStream
-{
-public:
-
-    SBStream ();
-    
-    ~SBStream ();
-
-    bool
-    IsValid() const;
-
-    // If this stream is not redirected to a file, it will maintain a local
-    // cache for the stream data which can be accessed using this accessor.
-    const char *
-    GetData ();
-
-    // If this stream is not redirected to a file, it will maintain a local
-    // cache for the stream output whose length can be accessed using this 
-    // accessor.
-    size_t
-    GetSize();
-
-    void
-    Printf (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
-
-    void
-    RedirectToFile (const char *path, bool append);
-
-    void
-    RedirectToFileHandle (FILE *fh, bool transfer_fh_ownership);
-
-    void
-    RedirectToFileDescriptor (int fd, bool transfer_fh_ownership);
-
-    // If the stream is redirected to a file, forget about the file and if
-    // ownership of the file was transferred to this object, close the file.
-    // If the stream is backed by a local cache, clear this cache.
-    void
-    Clear ();
-
-protected:
-    friend class SBAddress;
-    friend class SBBlock;
-    friend class SBBreakpoint;
-    friend class SBBreakpointLocation;
-    friend class SBCommandReturnObject;
-    friend class SBCompileUnit;
-    friend class SBData;
-    friend class SBDebugger;
-    friend class SBDeclaration;
-    friend class SBEvent;
-    friend class SBFileSpec;
-    friend class SBFileSpecList;
-    friend class SBFrame;
-    friend class SBFunction;
-    friend class SBInstruction;
-    friend class SBInstructionList;
-    friend class SBLineEntry;
-    friend class SBModule;
-    friend class SBModuleSpec;
-    friend class SBModuleSpecList;
-    friend class SBProcess;
-    friend class SBSection;
-    friend class SBSourceManager;
-    friend class SBSymbol;
-    friend class SBSymbolContext;
-    friend class SBSymbolContextList;
-    friend class SBTarget;
-    friend class SBThread;
-    friend class SBThreadPlan;
-    friend class SBType;
-    friend class SBTypeEnumMember;
-    friend class SBTypeMemberFunction;
-    friend class SBTypeMember;
-    friend class SBValue;
-    friend class SBWatchpoint;
-
-    lldb_private::Stream *
-    operator->();
-
-    lldb_private::Stream *
-    get();
-
-    lldb_private::Stream &
-    ref();
-
-private:
-
-    DISALLOW_COPY_AND_ASSIGN (SBStream);
-    std::unique_ptr<lldb_private::Stream> m_opaque_ap;
-    bool m_is_file;
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBStream_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBStringList.h b/kcov-38/external/lldb/include/lldb/API/SBStringList.h
deleted file mode 100644
index e0e58f765c6d..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBStringList.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//===-- SBStringList.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBStringList_h_
-#define LLDB_SBStringList_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBStringList
-{
-public:
-
-    SBStringList ();
-
-    SBStringList (const lldb::SBStringList &rhs);
-    
-    const SBStringList &
-    operator = (const SBStringList &rhs);
-
-    ~SBStringList ();
-
-    bool
-    IsValid() const;
-
-    void
-    AppendString (const char *str);
-
-    void
-    AppendList (const char **strv, int strc);
-
-    void
-    AppendList (const lldb::SBStringList &strings);
-
-    uint32_t
-    GetSize () const;
-
-    const char *
-    GetStringAtIndex (size_t idx);
-
-    void
-    Clear ();
-
-protected:
-    friend class SBCommandInterpreter;
-    friend class SBDebugger;
-
-    SBStringList (const lldb_private::StringList *lldb_strings);
-
-    const lldb_private::StringList *
-    operator->() const;
-
-    const lldb_private::StringList &
-    operator*() const;
-
-private:
-
-    std::unique_ptr<lldb_private::StringList> m_opaque_ap;
-
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBStringList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbol.h b/kcov-38/external/lldb/include/lldb/API/SBSymbol.h
deleted file mode 100644
index 3d259a2c20c6..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBSymbol.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//===-- SBSymbol.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBSymbol_h_
-#define LLDB_SBSymbol_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-#include "lldb/API/SBInstructionList.h"
-#include "lldb/API/SBTarget.h"
-
-namespace lldb {
-
-class LLDB_API SBSymbol
-{
-public:
-
-    SBSymbol ();
-
-    ~SBSymbol ();
-
-    SBSymbol (const lldb::SBSymbol &rhs);
-
-    const lldb::SBSymbol &
-    operator = (const lldb::SBSymbol &rhs);
-
-    bool
-    IsValid () const;
-
-
-    const char *
-    GetName() const;
-
-    const char *
-    GetMangledName () const;
-
-    lldb::SBInstructionList
-    GetInstructions (lldb::SBTarget target);
-
-    lldb::SBInstructionList
-    GetInstructions (lldb::SBTarget target, const char *flavor_string);
-
-    SBAddress
-    GetStartAddress ();
-    
-    SBAddress
-    GetEndAddress ();
-    
-    uint32_t
-    GetPrologueByteSize ();
-
-    SymbolType
-    GetType ();
-
-    bool
-    operator == (const lldb::SBSymbol &rhs) const;
-
-    bool
-    operator != (const lldb::SBSymbol &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    //----------------------------------------------------------------------
-    // Returns true if the symbol is externally visible in the module that
-    // it is defined in
-    //----------------------------------------------------------------------
-    bool
-    IsExternal();
-
-    //----------------------------------------------------------------------
-    // Returns true if the symbol was synthetically generated from something
-    // other than the actual symbol table itself in the object file.
-    //----------------------------------------------------------------------
-    bool
-    IsSynthetic();
-
-protected:
-
-    lldb_private::Symbol *
-    get ();
-
-    void
-    reset (lldb_private::Symbol *);
-    
-private:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBModule;
-    friend class SBSymbolContext;
-
-    SBSymbol (lldb_private::Symbol *lldb_object_ptr);
-    
-    void
-    SetSymbol (lldb_private::Symbol *lldb_object_ptr);
-
-    lldb_private::Symbol *m_opaque_ptr;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBSymbol_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h b/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
deleted file mode 100644
index 24c2ce9a1d6e..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBSymbolContext.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//===-- SBSymbolContext.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBSymbolContext_h_
-#define LLDB_SBSymbolContext_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBBlock.h"
-#include "lldb/API/SBCompileUnit.h"
-#include "lldb/API/SBFunction.h"
-#include "lldb/API/SBLineEntry.h"
-#include "lldb/API/SBModule.h"
-#include "lldb/API/SBSymbol.h"
-
-namespace lldb {
-
-class LLDB_API SBSymbolContext
-{
-public:
-    SBSymbolContext ();
-
-    SBSymbolContext (const lldb::SBSymbolContext& rhs);
-
-    ~SBSymbolContext ();
-
-    bool
-    IsValid () const;
-
-    const lldb::SBSymbolContext &
-    operator = (const lldb::SBSymbolContext &rhs);
-
-    lldb::SBModule        GetModule ();
-    lldb::SBCompileUnit   GetCompileUnit ();
-    lldb::SBFunction      GetFunction ();
-    lldb::SBBlock         GetBlock ();
-    lldb::SBLineEntry     GetLineEntry ();
-    lldb::SBSymbol        GetSymbol ();
-
-    void SetModule (lldb::SBModule module);
-    void SetCompileUnit (lldb::SBCompileUnit compile_unit);
-    void SetFunction (lldb::SBFunction function);
-    void SetBlock (lldb::SBBlock block);
-    void SetLineEntry (lldb::SBLineEntry line_entry);
-    void SetSymbol (lldb::SBSymbol symbol);
-
-    SBSymbolContext
-    GetParentOfInlinedScope (const SBAddress &curr_frame_pc, 
-                             SBAddress &parent_frame_addr) const;
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-protected:
-    friend class SBAddress;
-    friend class SBFrame;
-    friend class SBModule;
-    friend class SBThread;
-    friend class SBTarget;
-    friend class SBSymbolContextList;
-
-    lldb_private::SymbolContext*
-    operator->() const;
-
-    lldb_private::SymbolContext&
-    operator*();
-
-    lldb_private::SymbolContext&
-    ref();
-
-    const lldb_private::SymbolContext&
-    operator*() const;
-
-    lldb_private::SymbolContext *
-    get() const;
-
-    SBSymbolContext (const lldb_private::SymbolContext *sc_ptr);
-
-    void
-    SetSymbolContext (const lldb_private::SymbolContext *sc_ptr);
-
-private:
-    std::unique_ptr<lldb_private::SymbolContext> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBSymbolContext_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h b/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
deleted file mode 100644
index 79dcccdcbf84..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBSymbolContextList.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//===-- SBSymbolContextList.h -----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBSymbolContextList_h_
-#define LLDB_SBSymbolContextList_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBSymbolContext.h"
-
-namespace lldb {
-
-class LLDB_API SBSymbolContextList
-{
-public:
-    SBSymbolContextList ();
-
-    SBSymbolContextList (const lldb::SBSymbolContextList& rhs);
-
-    ~SBSymbolContextList ();
-
-    const lldb::SBSymbolContextList &
-    operator = (const lldb::SBSymbolContextList &rhs);
-
-    bool
-    IsValid () const;
-
-    uint32_t
-    GetSize() const;
-
-    lldb::SBSymbolContext
-    GetContextAtIndex (uint32_t idx);
-    
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    void
-    Append (lldb::SBSymbolContext &sc);
-    
-    void
-    Append (lldb::SBSymbolContextList &sc_list);
-    
-    void
-    Clear();
-
-protected:
-
-    friend class SBModule;
-    friend class SBTarget;
-
-    lldb_private::SymbolContextList*
-    operator->() const;
-
-    lldb_private::SymbolContextList&
-    operator*() const;
-
-private:
-    std::unique_ptr<lldb_private::SymbolContextList> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBSymbolContextList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTarget.h b/kcov-38/external/lldb/include/lldb/API/SBTarget.h
deleted file mode 100644
index dcca4e7b3a19..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTarget.h
+++ /dev/null
@@ -1,819 +0,0 @@
-//===-- SBTarget.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTarget_h_
-#define LLDB_SBTarget_h_
-
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBAddress.h"
-#include "lldb/API/SBAttachInfo.h"
-#include "lldb/API/SBBroadcaster.h"
-#include "lldb/API/SBFileSpec.h"
-#include "lldb/API/SBFileSpecList.h"
-#include "lldb/API/SBLaunchInfo.h"
-#include "lldb/API/SBSymbolContextList.h"
-#include "lldb/API/SBType.h"
-#include "lldb/API/SBValue.h"
-#include "lldb/API/SBWatchpoint.h"
-
-namespace lldb {
-
-class SBPlatform;
-
-class LLDB_API SBTarget
-{
-public:
-    //------------------------------------------------------------------
-    // Broadcaster bits.
-    //------------------------------------------------------------------
-    enum
-    {
-        eBroadcastBitBreakpointChanged  = (1 << 0),
-        eBroadcastBitModulesLoaded      = (1 << 1),
-        eBroadcastBitModulesUnloaded    = (1 << 2),
-        eBroadcastBitWatchpointChanged  = (1 << 3),
-        eBroadcastBitSymbolsLoaded      = (1 << 4)
-    };
-
-    //------------------------------------------------------------------
-    // Constructors
-    //------------------------------------------------------------------
-    SBTarget ();
-
-    SBTarget (const lldb::SBTarget& rhs);
-
-    SBTarget (const lldb::TargetSP& target_sp);
-    
-    const lldb::SBTarget&
-    operator = (const lldb::SBTarget& rhs);
-
-    //------------------------------------------------------------------
-    // Destructor
-    //------------------------------------------------------------------
-    ~SBTarget();
-
-    bool
-    IsValid() const;
-
-    static bool
-    EventIsTargetEvent (const lldb::SBEvent &event);
-
-    static lldb::SBTarget
-    GetTargetFromEvent (const lldb::SBEvent &event);
-    
-    static uint32_t
-    GetNumModulesFromEvent (const lldb::SBEvent &event);
-
-    static lldb::SBModule
-    GetModuleAtIndexFromEvent (const uint32_t idx, const lldb::SBEvent &event);
-
-    static const char *
-    GetBroadcasterClassName ();
-
-    lldb::SBProcess
-    GetProcess ();
-
-    //------------------------------------------------------------------
-    /// Return the platform object associated with the target.
-    ///
-    /// After return, the platform object should be checked for
-    /// validity.
-    ///
-    /// @return
-    ///     A platform object.
-    //------------------------------------------------------------------
-    lldb::SBPlatform
-    GetPlatform ();
-
-    //------------------------------------------------------------------
-    /// Install any binaries that need to be installed.
-    ///
-    /// This function does nothing when debugging on the host system.
-    /// When connected to remote platforms, the target's main executable
-    /// and any modules that have their remote install path set will be
-    /// installed on the remote platform. If the main executable doesn't
-    /// have an install location set, it will be installed in the remote
-    /// platform's working directory.
-    ///
-    /// @return
-    ///     An error describing anything that went wrong during
-    ///     installation.
-    //------------------------------------------------------------------
-    SBError
-    Install();
-    
-    //------------------------------------------------------------------
-    /// Launch a new process.
-    ///
-    /// Launch a new process by spawning a new process using the
-    /// target object's executable module's file as the file to launch.
-    /// Arguments are given in \a argv, and the environment variables
-    /// are in \a envp. Standard input and output files can be
-    /// optionally re-directed to \a stdin_path, \a stdout_path, and
-    /// \a stderr_path.
-    ///
-    /// @param[in] listener
-    ///     An optional listener that will receive all process events.
-    ///     If \a listener is valid then \a listener will listen to all
-    ///     process events. If not valid, then this target's debugger
-    ///     (SBTarget::GetDebugger()) will listen to all process events. 
-    ///
-    /// @param[in] argv
-    ///     The argument array.
-    ///
-    /// @param[in] envp
-    ///     The environment array.
-    ///
-    /// @param[in] launch_flags
-    ///     Flags to modify the launch (@see lldb::LaunchFlags)
-    ///
-    /// @param[in] stdin_path
-    ///     The path to use when re-directing the STDIN of the new
-    ///     process. If all stdXX_path arguments are NULL, a pseudo
-    ///     terminal will be used.
-    ///
-    /// @param[in] stdout_path
-    ///     The path to use when re-directing the STDOUT of the new
-    ///     process. If all stdXX_path arguments are NULL, a pseudo
-    ///     terminal will be used.
-    ///
-    /// @param[in] stderr_path
-    ///     The path to use when re-directing the STDERR of the new
-    ///     process. If all stdXX_path arguments are NULL, a pseudo
-    ///     terminal will be used.
-    ///
-    /// @param[in] working_directory
-    ///     The working directory to have the child process run in
-    ///
-    /// @param[in] launch_flags
-    ///     Some launch options specified by logical OR'ing 
-    ///     lldb::LaunchFlags enumeration values together.
-    ///
-    /// @param[in] stop_at_entry
-    ///     If false do not stop the inferior at the entry point.
-    ///
-    /// @param[out] error
-    ///     An error object. Contains the reason if there is some failure.
-    ///
-    /// @return
-    ///      A process object for the newly created process.
-    //------------------------------------------------------------------
-    lldb::SBProcess
-    Launch (SBListener &listener, 
-            char const **argv,
-            char const **envp,
-            const char *stdin_path,
-            const char *stdout_path,
-            const char *stderr_path,
-            const char *working_directory,
-            uint32_t launch_flags,   // See LaunchFlags
-            bool stop_at_entry,
-            lldb::SBError& error);
-            
-    
-    //------------------------------------------------------------------
-    /// Launch a new process with sensible defaults.
-    ///
-    /// @param[in] argv
-    ///     The argument array.
-    ///
-    /// @param[in] envp
-    ///     The environment array.
-    ///
-    /// @param[in] working_directory
-    ///     The working directory to have the child process run in
-    ///
-    /// Default: listener
-    ///     Set to the target's debugger (SBTarget::GetDebugger())
-    ///
-    /// Default: launch_flags
-    ///     Empty launch flags
-    ///
-    /// Default: stdin_path
-    /// Default: stdout_path
-    /// Default: stderr_path
-    ///     A pseudo terminal will be used.
-    ///
-    /// @return
-    ///      A process object for the newly created process.
-    //------------------------------------------------------------------
-    SBProcess
-    LaunchSimple (const char **argv, 
-                  const char **envp,
-                  const char *working_directory);
-    
-    SBProcess
-    Launch (SBLaunchInfo &launch_info, SBError& error);
-    
-    SBProcess
-    LoadCore (const char *core_file);
-
-    SBProcess
-    Attach (SBAttachInfo &attach_info, SBError& error);
-
-    //------------------------------------------------------------------
-    /// Attach to process with pid.
-    ///
-    /// @param[in] listener
-    ///     An optional listener that will receive all process events.
-    ///     If \a listener is valid then \a listener will listen to all
-    ///     process events. If not valid, then this target's debugger
-    ///     (SBTarget::GetDebugger()) will listen to all process events.
-    ///
-    /// @param[in] pid
-    ///     The process ID to attach to.
-    ///
-    /// @param[out] error
-    ///     An error explaining what went wrong if attach fails.
-    ///
-    /// @return
-    ///      A process object for the attached process.
-    //------------------------------------------------------------------
-    lldb::SBProcess
-    AttachToProcessWithID (SBListener &listener,
-                           lldb::pid_t pid,
-                           lldb::SBError& error);
-
-#if defined(__APPLE__)
-    // We need to keep this around for a build or two since Xcode links
-    // to the 32 bit version of this function. We will take it out soon.
-    lldb::SBProcess
-    AttachToProcessWithID (SBListener &listener,
-                           ::pid_t pid,           // 32 bit int process ID
-                           lldb::SBError& error); // DEPRECATED 
-#endif
-    //------------------------------------------------------------------
-    /// Attach to process with name.
-    ///
-    /// @param[in] listener
-    ///     An optional listener that will receive all process events.
-    ///     If \a listener is valid then \a listener will listen to all
-    ///     process events. If not valid, then this target's debugger
-    ///     (SBTarget::GetDebugger()) will listen to all process events.
-    ///
-    /// @param[in] name
-    ///     Basename of process to attach to.
-    ///
-    /// @param[in] wait_for
-    ///     If true wait for a new instance of 'name' to be launched.
-    ///
-    /// @param[out] error
-    ///     An error explaining what went wrong if attach fails.
-    ///
-    /// @return
-    ///      A process object for the attached process.
-    //------------------------------------------------------------------
-    lldb::SBProcess
-    AttachToProcessWithName (SBListener &listener,
-                             const char *name,
-                             bool wait_for,
-                             lldb::SBError& error);
-
-    //------------------------------------------------------------------
-    /// Connect to a remote debug server with url.
-    ///
-    /// @param[in] listener
-    ///     An optional listener that will receive all process events.
-    ///     If \a listener is valid then \a listener will listen to all
-    ///     process events. If not valid, then this target's debugger
-    ///     (SBTarget::GetDebugger()) will listen to all process events.
-    ///
-    /// @param[in] url
-    ///     The url to connect to, e.g., 'connect://localhost:12345'.
-    ///
-    /// @param[in] plugin_name
-    ///     The plugin name to be used; can be NULL.
-    ///
-    /// @param[out] error
-    ///     An error explaining what went wrong if the connect fails.
-    ///
-    /// @return
-    ///      A process object for the connected process.
-    //------------------------------------------------------------------
-    lldb::SBProcess
-    ConnectRemote (SBListener &listener,
-                   const char *url,
-                   const char *plugin_name,
-                   SBError& error);
-    
-    lldb::SBFileSpec
-    GetExecutable ();
-
-    bool
-    AddModule (lldb::SBModule &module);
-
-    lldb::SBModule
-    AddModule (const char *path,
-               const char *triple,
-               const char *uuid);
-
-    lldb::SBModule
-    AddModule (const char *path,
-               const char *triple,
-               const char *uuid_cstr,
-               const char *symfile);
-    
-    lldb::SBModule
-    AddModule (const SBModuleSpec &module_spec);
-
-    uint32_t
-    GetNumModules () const;
-
-    lldb::SBModule
-    GetModuleAtIndex (uint32_t idx);
-
-    bool
-    RemoveModule (lldb::SBModule module);
-
-    lldb::SBDebugger
-    GetDebugger() const;
-
-    lldb::SBModule
-    FindModule (const lldb::SBFileSpec &file_spec);
-
-    lldb::ByteOrder
-    GetByteOrder ();
-
-    uint32_t
-    GetAddressByteSize();
-
-    const char *
-    GetTriple ();
-
-    //------------------------------------------------------------------
-    /// Architecture data byte width accessor
-    ///
-    /// @return
-    /// The size in 8-bit (host) bytes of a minimum addressable
-    /// unit from the Architecture's data bus
-    //------------------------------------------------------------------
-    uint32_t
-    GetDataByteSize ();
-
-    //------------------------------------------------------------------
-    /// Architecture code byte width accessor
-    ///
-    /// @return
-    /// The size in 8-bit (host) bytes of a minimum addressable
-    /// unit from the Architecture's code bus
-    //------------------------------------------------------------------
-    uint32_t
-    GetCodeByteSize ();
-
-    //------------------------------------------------------------------
-    /// Set the base load address for a module section.
-    ///
-    /// @param[in] section
-    ///     The section whose base load address will be set within this
-    ///     target.
-    ///
-    /// @param[in] section_base_addr
-    ///     The base address for the section.
-    ///
-    /// @return
-    ///      An error to indicate success, fail, and any reason for 
-    ///     failure.
-    //------------------------------------------------------------------
-    lldb::SBError
-    SetSectionLoadAddress (lldb::SBSection section,
-                           lldb::addr_t section_base_addr);
-    
-    //------------------------------------------------------------------
-    /// Clear the base load address for a module section.
-    ///
-    /// @param[in] section
-    ///     The section whose base load address will be cleared within
-    ///     this target.
-    ///
-    /// @return
-    ///      An error to indicate success, fail, and any reason for 
-    ///     failure.
-    //------------------------------------------------------------------
-    lldb::SBError
-    ClearSectionLoadAddress (lldb::SBSection section);
-    
-    //------------------------------------------------------------------
-    /// Slide all file addresses for all module sections so that \a module
-    /// appears to loaded at these slide addresses.
-    /// 
-    /// When you need all sections within a module to be loaded at a 
-    /// rigid slide from the addresses found in the module object file,
-    /// this function will allow you to easily and quickly slide all
-    /// module sections.
-    ///
-    /// @param[in] module
-    ///     The module to load.
-    ///
-    /// @param[in] sections_offset
-    ///     An offset that will be applied to all section file addresses
-    ///     (the virtual addresses found in the object file itself).
-    ///
-    /// @return
-    ///     An error to indicate success, fail, and any reason for 
-    ///     failure.
-    //------------------------------------------------------------------
-    lldb::SBError
-    SetModuleLoadAddress (lldb::SBModule module,
-                          int64_t sections_offset);
-    
-
-    //------------------------------------------------------------------
-    /// Clear the section base load addresses for all sections in a module.
-    /// 
-    /// @param[in] module
-    ///     The module to unload.
-    ///
-    /// @return
-    ///     An error to indicate success, fail, and any reason for 
-    ///     failure.
-    //------------------------------------------------------------------
-    lldb::SBError
-    ClearModuleLoadAddress (lldb::SBModule module);
-
-    //------------------------------------------------------------------
-    /// Find functions by name.
-    ///
-    /// @param[in] name
-    ///     The name of the function we are looking for.
-    ///
-    /// @param[in] name_type_mask
-    ///     A logical OR of one or more FunctionNameType enum bits that
-    ///     indicate what kind of names should be used when doing the
-    ///     lookup. Bits include fully qualified names, base names,
-    ///     C++ methods, or ObjC selectors. 
-    ///     See FunctionNameType for more details.
-    ///
-    /// @return
-    ///     A lldb::SBSymbolContextList that gets filled in with all of 
-    ///     the symbol contexts for all the matches.
-    //------------------------------------------------------------------
-    lldb::SBSymbolContextList
-    FindFunctions (const char *name, 
-                   uint32_t name_type_mask = lldb::eFunctionNameTypeAny);
-
-    //------------------------------------------------------------------
-    /// Find global and static variables by name.
-    ///
-    /// @param[in] name
-    ///     The name of the global or static variable we are looking
-    ///     for.
-    ///
-    /// @param[in] max_matches
-    ///     Allow the number of matches to be limited to \a max_matches.
-    ///
-    /// @return
-    ///     A list of matched variables in an SBValueList.
-    //------------------------------------------------------------------
-    lldb::SBValueList
-    FindGlobalVariables (const char *name, 
-                         uint32_t max_matches);
-
-    //------------------------------------------------------------------
-    /// Find the first global (or static) variable by name.
-    ///
-    /// @param[in] name
-    ///     The name of the global or static variable we are looking
-    ///     for.
-    ///
-    /// @return
-    ///     An SBValue that gets filled in with the found variable (if any).
-    //------------------------------------------------------------------
-    lldb::SBValue
-    FindFirstGlobalVariable (const char* name);
-
-    //------------------------------------------------------------------
-    /// Find global and static variables by pattern.
-    ///
-    /// @param[in] name
-    ///     The pattern to search for global or static variables
-    ///
-    /// @param[in] max_matches
-    ///     Allow the number of matches to be limited to \a max_matches.
-    /// 
-    /// @param[in] matchtype
-    ///     The match type to use.    
-    ///
-    /// @return
-    ///     A list of matched variables in an SBValueList.
-    //------------------------------------------------------------------
-    lldb::SBValueList
-        FindGlobalVariables(const char *name,
-                            uint32_t max_matches,
-                            MatchType matchtype);
-    
-    //------------------------------------------------------------------
-    /// Find global functions by their name with pattern matching.
-    ///
-    /// @param[in] name
-    ///     The pattern to search for global or static variables
-    ///
-    /// @param[in] max_matches
-    ///     Allow the number of matches to be limited to \a max_matches.
-    /// 
-    /// @param[in] matchtype
-    ///     The match type to use.    
-    ///
-    /// @return
-    ///     A list of matched variables in an SBValueList.
-    //------------------------------------------------------------------
-    lldb::SBSymbolContextList
-        FindGlobalFunctions(const char *name,
-                           uint32_t max_matches,
-                           MatchType matchtype);
-
-    void
-    Clear ();
-
-    //------------------------------------------------------------------
-    /// Resolve a current file address into a section offset address.
-    ///
-    /// @param[in] file_addr
-    ///
-    /// @return
-    ///     An SBAddress which will be valid if...
-    //------------------------------------------------------------------
-    lldb::SBAddress
-    ResolveFileAddress (lldb::addr_t file_addr);
-
-    //------------------------------------------------------------------
-    /// Resolve a current load address into a section offset address.
-    ///
-    /// @param[in] vm_addr
-    ///     A virtual address from the current process state that is to
-    ///     be translated into a section offset address.
-    ///
-    /// @return
-    ///     An SBAddress which will be valid if \a vm_addr was
-    ///     successfully resolved into a section offset address, or an
-    ///     invalid SBAddress if \a vm_addr doesn't resolve to a section
-    ///     in a module.
-    //------------------------------------------------------------------
-    lldb::SBAddress
-    ResolveLoadAddress (lldb::addr_t vm_addr);
-
-    //------------------------------------------------------------------
-    /// Resolve a current load address into a section offset address
-    /// using the process stop ID to identify a time in the past.
-    ///
-    /// @param[in] stop_id
-    ///     Each time a process stops, the process stop ID integer gets
-    ///     incremented. These stop IDs are used to identify past times
-    ///     and can be used in history objects as a cheap way to store
-    ///     the time at which the sample was taken. Specifying
-    ///     UINT32_MAX will always resolve the address using the
-    ///     currently loaded sections.
-    ///
-    /// @param[in] vm_addr
-    ///     A virtual address from the current process state that is to
-    ///     be translated into a section offset address.
-    ///
-    /// @return
-    ///     An SBAddress which will be valid if \a vm_addr was
-    ///     successfully resolved into a section offset address, or an
-    ///     invalid SBAddress if \a vm_addr doesn't resolve to a section
-    ///     in a module.
-    //------------------------------------------------------------------
-    lldb::SBAddress
-    ResolvePastLoadAddress (uint32_t stop_id, lldb::addr_t vm_addr);
-
-    SBSymbolContext
-    ResolveSymbolContextForAddress (const SBAddress& addr, 
-                                    uint32_t resolve_scope);
-
-    //------------------------------------------------------------------
-    /// Read target memory. If a target process is running then memory  
-    /// is read from here. Otherwise the memory is read from the object
-    /// files. For a target whose bytes are sized as a multiple of host
-    /// bytes, the data read back will preserve the target's byte order.
-    ///
-    /// @param[in] addr
-    ///     A target address to read from. 
-    ///
-    /// @param[out] buf
-    ///     The buffer to read memory into. 
-    ///
-    /// @param[in] size
-    ///     The maximum number of host bytes to read in the buffer passed
-    ///     into this call
-    ///
-    /// @param[out] error
-    ///     Error information is written here if the memory read fails.
-    ///
-    /// @return
-    ///     The amount of data read in host bytes.
-    //------------------------------------------------------------------
-    size_t
-    ReadMemory (const SBAddress addr, void *buf, size_t size, lldb::SBError &error);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByLocation (const char *file, uint32_t line);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByLocation (const lldb::SBFileSpec &file_spec, uint32_t line);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByName (const char *symbol_name, const char *module_name = NULL);
-
-    // This version uses name_type_mask = eFunctionNameTypeAuto
-    lldb::SBBreakpoint
-    BreakpointCreateByName (const char *symbol_name, 
-                            const SBFileSpecList &module_list, 
-                            const SBFileSpecList &comp_unit_list);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByName (const char *symbol_name,
-                            uint32_t name_type_mask,           // Logical OR one or more FunctionNameType enum bits
-                            const SBFileSpecList &module_list, 
-                            const SBFileSpecList &comp_unit_list);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByNames (const char *symbol_name[],
-                             uint32_t num_names,
-                             uint32_t name_type_mask,           // Logical OR one or more FunctionNameType enum bits
-                             const SBFileSpecList &module_list,
-                             const SBFileSpecList &comp_unit_list);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByRegex (const char *symbol_name_regex, const char *module_name = NULL);
-    
-    lldb::SBBreakpoint
-    BreakpointCreateByRegex (const char *symbol_name_regex, 
-                             const SBFileSpecList &module_list, 
-                             const SBFileSpecList &comp_unit_list);
-    
-    lldb::SBBreakpoint
-    BreakpointCreateBySourceRegex (const char *source_regex, 
-                                   const SBFileSpec &source_file,
-                                   const char *module_name = NULL);
-
-    lldb::SBBreakpoint
-    BreakpointCreateBySourceRegex (const char *source_regex,
-                                   const SBFileSpecList &module_list,
-                                   const SBFileSpecList &source_file);
-    
-    lldb::SBBreakpoint
-    BreakpointCreateForException  (lldb::LanguageType language,
-                                   bool catch_bp,
-                                   bool throw_bp);
-
-    lldb::SBBreakpoint
-    BreakpointCreateByAddress (addr_t address);
-
-    uint32_t
-    GetNumBreakpoints () const;
-
-    lldb::SBBreakpoint
-    GetBreakpointAtIndex (uint32_t idx) const;
-
-    bool
-    BreakpointDelete (break_id_t break_id);
-
-    lldb::SBBreakpoint
-    FindBreakpointByID (break_id_t break_id);
-
-    bool
-    EnableAllBreakpoints ();
-
-    bool
-    DisableAllBreakpoints ();
-
-    bool
-    DeleteAllBreakpoints ();
-
-    uint32_t
-    GetNumWatchpoints () const;
-
-    lldb::SBWatchpoint
-    GetWatchpointAtIndex (uint32_t idx) const;
-
-    bool
-    DeleteWatchpoint (lldb::watch_id_t watch_id);
-
-    lldb::SBWatchpoint
-    FindWatchpointByID (lldb::watch_id_t watch_id);
-
-    lldb::SBWatchpoint
-    WatchAddress (lldb::addr_t addr, size_t size, bool read, bool write, SBError& error);
-
-    bool
-    EnableAllWatchpoints ();
-
-    bool
-    DisableAllWatchpoints ();
-
-    bool
-    DeleteAllWatchpoints ();
-
-    lldb::SBBroadcaster
-    GetBroadcaster () const;
-    
-    lldb::SBType
-    FindFirstType (const char* type);
-    
-    lldb::SBTypeList
-    FindTypes (const char* type);
-    
-    lldb::SBType
-    GetBasicType(lldb::BasicType type);
-    
-    lldb::SBValue
-    CreateValueFromAddress (const char *name, lldb::SBAddress addr, lldb::SBType type);
-
-    lldb::SBValue
-    CreateValueFromData (const char *name, lldb::SBData data, lldb::SBType type);
-
-    lldb::SBValue
-    CreateValueFromExpression (const char *name, const char* expr);
-    
-    SBSourceManager
-    GetSourceManager();
-    
-    lldb::SBInstructionList
-    ReadInstructions (lldb::SBAddress base_addr, uint32_t count);
-
-    lldb::SBInstructionList
-    ReadInstructions (lldb::SBAddress base_addr, uint32_t count, const char *flavor_string);
-
-    lldb::SBInstructionList
-    GetInstructions (lldb::SBAddress base_addr, const void *buf, size_t size);
-    
-    // The "WithFlavor" is necessary to keep SWIG from getting confused about overloaded arguments when
-    // using the buf + size -> Python Object magic.
-    
-    lldb::SBInstructionList
-    GetInstructionsWithFlavor (lldb::SBAddress base_addr,  const char *flavor_string, const void *buf, size_t size);
-    
-    lldb::SBInstructionList
-    GetInstructions (lldb::addr_t base_addr, const void *buf, size_t size);
-
-    lldb::SBInstructionList
-    GetInstructionsWithFlavor (lldb::addr_t base_addr, const char *flavor_string, const void *buf, size_t size);
-
-    lldb::SBSymbolContextList
-    FindSymbols (const char *name,
-                 lldb::SymbolType type = eSymbolTypeAny);
-
-    bool
-    operator == (const lldb::SBTarget &rhs) const;
-
-    bool
-    operator != (const lldb::SBTarget &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description, lldb::DescriptionLevel description_level);
-
-    lldb::SBValue
-    EvaluateExpression (const char *expr, const SBExpressionOptions &options);
-
-    lldb::addr_t
-    GetStackRedZoneSize();
-
-    lldb::SBLaunchInfo
-    GetLaunchInfo () const;
-
-    void
-    SetLaunchInfo (const lldb::SBLaunchInfo &launch_info);
-    
-protected:
-    friend class SBAddress;
-    friend class SBBlock;
-    friend class SBDebugger;
-    friend class SBExecutionContext;
-    friend class SBFunction;
-    friend class SBInstruction;
-    friend class SBModule;
-    friend class SBProcess;
-    friend class SBSection;
-    friend class SBSourceManager;
-    friend class SBSymbol;
-    friend class SBValue;
-
-    //------------------------------------------------------------------
-    // Constructors are private, use static Target::Create function to
-    // create an instance of this class.
-    //------------------------------------------------------------------
-
-    lldb::TargetSP
-    GetSP () const;
-
-    void
-    SetSP (const lldb::TargetSP& target_sp);
-
-
-private:
-    //------------------------------------------------------------------
-    // For Target only
-    //------------------------------------------------------------------
-
-    lldb::TargetSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBTarget_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThread.h b/kcov-38/external/lldb/include/lldb/API/SBThread.h
deleted file mode 100644
index 2c45fa8d5120..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBThread.h
+++ /dev/null
@@ -1,259 +0,0 @@
-//===-- SBThread.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBThread_h_
-#define LLDB_SBThread_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-
-namespace lldb {
-
-class SBFrame;
-
-class LLDB_API SBThread
-{
-public:
-    enum
-    {
-        eBroadcastBitStackChanged           = (1 << 0),
-        eBroadcastBitThreadSuspended        = (1 << 1),
-        eBroadcastBitThreadResumed          = (1 << 2),
-        eBroadcastBitSelectedFrameChanged   = (1 << 3),
-        eBroadcastBitThreadSelected         = (1 << 4)
-    };
-
-    static const char *
-    GetBroadcasterClassName ();
-    
-    SBThread ();
-
-    SBThread (const lldb::SBThread &thread);
-    
-    SBThread (const lldb::ThreadSP& lldb_object_sp);
-
-   ~SBThread();
-
-    lldb::SBQueue
-    GetQueue () const;
-
-    bool
-    IsValid() const;
-
-    void
-    Clear ();
-
-    lldb::StopReason
-    GetStopReason();
-
-    /// Get the number of words associated with the stop reason.
-    /// See also GetStopReasonDataAtIndex().
-    size_t
-    GetStopReasonDataCount();
-
-    //--------------------------------------------------------------------------
-    /// Get information associated with a stop reason.
-    ///
-    /// Breakpoint stop reasons will have data that consists of pairs of 
-    /// breakpoint IDs followed by the breakpoint location IDs (they always come
-    /// in pairs).
-    ///
-    /// Stop Reason              Count Data Type
-    /// ======================== ===== =========================================
-    /// eStopReasonNone          0
-    /// eStopReasonTrace         0
-    /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
-    /// eStopReasonWatchpoint    1     watchpoint id
-    /// eStopReasonSignal        1     unix signal number
-    /// eStopReasonException     N     exception data
-    /// eStopReasonExec          0
-    /// eStopReasonPlanComplete  0
-    //--------------------------------------------------------------------------
-    uint64_t
-    GetStopReasonDataAtIndex(uint32_t idx);
-    
-    bool
-    GetStopReasonExtendedInfoAsJSON (lldb::SBStream &stream);
-    
-    size_t
-    GetStopDescription (char *dst, size_t dst_len);
-    
-    SBValue
-    GetStopReturnValue ();
-
-    lldb::tid_t
-    GetThreadID () const;
-
-    uint32_t
-    GetIndexID () const;
-
-    const char *
-    GetName () const;
-
-    const char *
-    GetQueueName() const;
-
-    lldb::queue_id_t
-    GetQueueID() const;
-
-    bool
-    GetInfoItemByPathAsString ( const char *path, SBStream &strm);
-
-    void
-    StepOver (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
-
-    void
-    StepInto (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
-
-    void
-    StepInto (const char *target_name, lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
-    
-    void
-    StepOut ();
-
-    void
-    StepOutOfFrame (lldb::SBFrame &frame);
-
-    void
-    StepInstruction(bool step_over);
-
-    SBError
-    StepOverUntil (lldb::SBFrame &frame, 
-                   lldb::SBFileSpec &file_spec, 
-                   uint32_t line);
-
-    SBError
-    StepUsingScriptedThreadPlan (const char *script_class_name);
-
-    SBError
-    JumpToLine (lldb::SBFileSpec &file_spec, uint32_t line);
-
-    void
-    RunToAddress (lldb::addr_t addr);
-    
-    SBError
-    ReturnFromFrame (SBFrame &frame, SBValue &return_value);
-
-    //--------------------------------------------------------------------------
-    /// LLDB currently supports process centric debugging which means when any
-    /// thread in a process stops, all other threads are stopped. The Suspend()
-    /// call here tells our process to suspend a thread and not let it run when
-    /// the other threads in a process are allowed to run. So when 
-    /// SBProcess::Continue() is called, any threads that aren't suspended will
-    /// be allowed to run. If any of the SBThread functions for stepping are 
-    /// called (StepOver, StepInto, StepOut, StepInstruction, RunToAddress), the
-    /// thread will not be allowed to run and these functions will simply return.
-    ///
-    /// Eventually we plan to add support for thread centric debugging where
-    /// each thread is controlled individually and each thread would broadcast
-    /// its state, but we haven't implemented this yet.
-    /// 
-    /// Likewise the SBThread::Resume() call will again allow the thread to run
-    /// when the process is continued.
-    ///
-    /// Suspend() and Resume() functions are not currently reference counted, if
-    /// anyone has the need for them to be reference counted, please let us
-    /// know.
-    //--------------------------------------------------------------------------
-    bool
-    Suspend();
-    
-    bool
-    Resume ();
-    
-    bool
-    IsSuspended();
-
-    bool
-    IsStopped();
-
-    uint32_t
-    GetNumFrames ();
-
-    lldb::SBFrame
-    GetFrameAtIndex (uint32_t idx);
-
-    lldb::SBFrame
-    GetSelectedFrame ();
-
-    lldb::SBFrame
-    SetSelectedFrame (uint32_t frame_idx);
-    
-    static bool
-    EventIsThreadEvent (const SBEvent &event);
-    
-    static SBFrame
-    GetStackFrameFromEvent (const SBEvent &event);
-    
-    static SBThread
-    GetThreadFromEvent (const SBEvent &event);
-
-    lldb::SBProcess
-    GetProcess ();
-
-    const lldb::SBThread &
-    operator = (const lldb::SBThread &rhs);
-
-    bool
-    operator == (const lldb::SBThread &rhs) const;
-
-    bool
-    operator != (const lldb::SBThread &rhs) const;
-
-    bool
-    GetDescription (lldb::SBStream &description) const;
-    
-    bool
-    GetStatus (lldb::SBStream &status) const;
-
-    SBThread
-    GetExtendedBacktraceThread (const char *type);
-
-    uint32_t
-    GetExtendedBacktraceOriginatingIndexID ();
-
-    bool
-    SafeToCallFunctions ();
-
-#ifndef SWIG
-    lldb_private::Thread *
-    operator->();
-
-    lldb_private::Thread *
-    get();
-
-#endif
-
-protected:
-    friend class SBBreakpoint;
-    friend class SBBreakpointLocation;
-    friend class SBExecutionContext;
-    friend class SBFrame;
-    friend class SBProcess;
-    friend class SBDebugger;
-    friend class SBValue;
-    friend class lldb_private::QueueImpl;
-    friend class SBQueueItem;
-
-    void
-    SetThread (const lldb::ThreadSP& lldb_object_sp);
-
-#ifndef SWIG
-    SBError
-    ResumeNewPlan (lldb_private::ExecutionContext &exe_ctx, lldb_private::ThreadPlan *new_plan);
-#endif
-
-private:
-    lldb::ExecutionContextRefSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBThread_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h b/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
deleted file mode 100644
index 996ee3cd22aa..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBThreadCollection.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//===-- SBThreadCollection.h ------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBThreadCollection_h_
-#define LLDB_SBThreadCollection_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-    
-class LLDB_API SBThreadCollection
-{
-public:
-    
-    SBThreadCollection ();
-    
-    SBThreadCollection (const SBThreadCollection &rhs);
-    
-    const SBThreadCollection &
-    operator = (const SBThreadCollection &rhs);
-    
-    ~SBThreadCollection ();
-    
-    bool
-    IsValid () const;
-    
-    size_t
-    GetSize ();
-    
-    lldb::SBThread
-    GetThreadAtIndex (size_t idx);
-    
-protected:
-    
-    // Mimic shared pointer...
-    lldb_private::ThreadCollection *
-    get() const;
-    
-    lldb_private::ThreadCollection *
-    operator->() const;
-    
-    lldb::ThreadCollectionSP &
-    operator*();
-    
-    const lldb::ThreadCollectionSP &
-    operator*() const;
-    
-    SBThreadCollection (const lldb::ThreadCollectionSP &threads);
-
-    void
-    SetOpaque (const lldb::ThreadCollectionSP &threads);
-    
-private:
-    friend class SBProcess;
-    
-    lldb::ThreadCollectionSP m_opaque_sp;
-};
-    
-    
-} // namespace lldb
-
-#endif // LLDB_SBThreadCollection_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h b/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
deleted file mode 100644
index 9cc0d0b89bb5..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBThreadPlan.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//===-- SBThread.h ----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBThreadPlan_h_
-#define LLDB_SBThreadPlan_h_
-
-#include "lldb/API/SBDefines.h"
-
-#include <stdio.h>
-
-namespace lldb {
-
-class LLDB_API SBThreadPlan
-{
-
-friend class lldb_private::ThreadPlan;
-
-public:
-    SBThreadPlan ();
-
-    SBThreadPlan (const lldb::SBThreadPlan &threadPlan);
-    
-    SBThreadPlan (const lldb::ThreadPlanSP& lldb_object_sp);
-
-    SBThreadPlan (lldb::SBThread &thread, const char *class_name);
-
-   ~SBThreadPlan ();
-
-    bool
-    IsValid() const;
-
-    void
-    Clear ();
-
-    lldb::StopReason
-    GetStopReason();
-
-    /// Get the number of words associated with the stop reason.
-    /// See also GetStopReasonDataAtIndex().
-    size_t
-    GetStopReasonDataCount();
-
-    //--------------------------------------------------------------------------
-    /// Get information associated with a stop reason.
-    ///
-    /// Breakpoint stop reasons will have data that consists of pairs of 
-    /// breakpoint IDs followed by the breakpoint location IDs (they always come
-    /// in pairs).
-    ///
-    /// Stop Reason              Count Data Type
-    /// ======================== ===== =========================================
-    /// eStopReasonNone          0
-    /// eStopReasonTrace         0
-    /// eStopReasonBreakpoint    N     duple: {breakpoint id, location id}
-    /// eStopReasonWatchpoint    1     watchpoint id
-    /// eStopReasonSignal        1     unix signal number
-    /// eStopReasonException     N     exception data
-    /// eStopReasonExec          0
-    /// eStopReasonPlanComplete  0
-    //--------------------------------------------------------------------------
-    uint64_t
-    GetStopReasonDataAtIndex(uint32_t idx);
-
-    SBThread
-    GetThread () const;
-
-    const lldb::SBThreadPlan &
-    operator = (const lldb::SBThreadPlan &rhs);
-
-    bool
-    GetDescription (lldb::SBStream &description) const;
-
-    void
-    SetPlanComplete (bool success);
-
-    bool
-    IsPlanComplete();
-
-    bool
-    IsValid();
-
-    // This section allows an SBThreadPlan to push another of the common types of plans...
-    SBThreadPlan
-    QueueThreadPlanForStepOverRange (SBAddress &start_address,
-                                     lldb::addr_t range_size);
-
-    SBThreadPlan
-    QueueThreadPlanForStepInRange (SBAddress &start_address,
-                                   lldb::addr_t range_size);
-
-    SBThreadPlan
-    QueueThreadPlanForStepOut (uint32_t frame_idx_to_step_to, bool first_insn = false);
-
-    SBThreadPlan
-    QueueThreadPlanForRunToAddress (SBAddress address);
-
-#ifndef SWIG
-    lldb_private::ThreadPlan *
-    get();
-#endif
-
-protected:
-    friend class SBBreakpoint;
-    friend class SBBreakpointLocation;
-    friend class SBFrame;
-    friend class SBProcess;
-    friend class SBDebugger;
-    friend class SBValue;
-    friend class lldb_private::QueueImpl;
-    friend class SBQueueItem;
-
-#ifndef SWIG
-    void
-    SetThreadPlan (const lldb::ThreadPlanSP& lldb_object_sp);
-#endif
-
-private:
-    lldb::ThreadPlanSP m_opaque_sp;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBThreadPlan_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBType.h b/kcov-38/external/lldb/include/lldb/API/SBType.h
deleted file mode 100644
index 01f0c6afc795..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBType.h
+++ /dev/null
@@ -1,333 +0,0 @@
-//===-- SBType.h ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBType_h_
-#define LLDB_SBType_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class SBTypeList;    
-
-class LLDB_API SBTypeMember
-{
-public:
-    SBTypeMember ();
-    
-    SBTypeMember (const lldb::SBTypeMember& rhs);
-    
-    ~SBTypeMember();
-
-    lldb::SBTypeMember&
-    operator = (const lldb::SBTypeMember& rhs);
-
-    bool
-    IsValid() const;
-    
-    const char *
-    GetName ();
-    
-    lldb::SBType
-    GetType ();
-    
-    uint64_t
-    GetOffsetInBytes();
-    
-    uint64_t
-    GetOffsetInBits();
-
-    bool
-    IsBitfield();
-    
-    uint32_t
-    GetBitfieldSizeInBits();
-
-    bool
-    GetDescription (lldb::SBStream &description, 
-                    lldb::DescriptionLevel description_level);
-    
-protected:
-    friend class SBType;
-
-    void
-    reset (lldb_private::TypeMemberImpl *);
-
-    lldb_private::TypeMemberImpl &
-    ref ();
-
-    const lldb_private::TypeMemberImpl &
-    ref () const;
-
-    std::unique_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
-};
-    
-class SBTypeMemberFunction
-{
-public:
-    SBTypeMemberFunction ();
-    
-    SBTypeMemberFunction (const lldb::SBTypeMemberFunction& rhs);
-    
-    ~SBTypeMemberFunction();
-    
-    lldb::SBTypeMemberFunction&
-    operator = (const lldb::SBTypeMemberFunction& rhs);
-    
-    bool
-    IsValid() const;
-    
-    const char *
-    GetName ();
-    
-    lldb::SBType
-    GetType ();
-    
-    lldb::SBType
-    GetReturnType ();
-    
-    uint32_t
-    GetNumberOfArguments ();
-    
-    lldb::SBType
-    GetArgumentTypeAtIndex (uint32_t);
-    
-    lldb::MemberFunctionKind
-    GetKind();
-    
-    bool
-    GetDescription (lldb::SBStream &description,
-                    lldb::DescriptionLevel description_level);
-    
-protected:
-    friend class SBType;
-    
-    void
-    reset (lldb_private::TypeMemberFunctionImpl *);
-    
-    lldb_private::TypeMemberFunctionImpl &
-    ref ();
-    
-    const lldb_private::TypeMemberFunctionImpl &
-    ref () const;
-    
-    lldb::TypeMemberFunctionImplSP m_opaque_sp;
-};
-
-
-class SBType
-{
-public:
-
-    SBType();
-
-    SBType (const lldb::SBType &rhs);
-
-    ~SBType ();
-
-    bool
-    IsValid() const;
-    
-    uint64_t
-    GetByteSize();
-
-    bool
-    IsPointerType();
-    
-    bool
-    IsReferenceType();
-    
-    bool
-    IsFunctionType ();
-    
-    bool
-    IsPolymorphicClass ();
-    
-    bool
-    IsArrayType ();
-    
-    bool
-    IsVectorType ();
-    
-    bool
-    IsTypedefType ();
-    
-    lldb::SBType
-    GetPointerType();
-    
-    lldb::SBType
-    GetPointeeType();
-    
-    lldb::SBType
-    GetReferenceType();
-    
-    lldb::SBType
-    GetTypedefedType();
-
-    lldb::SBType
-    GetDereferencedType();
-
-    lldb::SBType
-    GetUnqualifiedType();
-    
-    lldb::SBType
-    GetArrayElementType ();
-    
-    lldb::SBType
-    GetVectorElementType ();
-
-    lldb::SBType
-    GetCanonicalType();
-    // Get the "lldb::BasicType" enumeration for a type. If a type is not a basic
-    // type eBasicTypeInvalid will be returned
-    lldb::BasicType
-    GetBasicType();
-
-    // The call below confusing and should really be renamed to "CreateBasicType"
-    lldb::SBType
-    GetBasicType(lldb::BasicType type);
-    
-    uint32_t
-    GetNumberOfFields ();
-    
-    uint32_t
-    GetNumberOfDirectBaseClasses ();
-
-    uint32_t
-    GetNumberOfVirtualBaseClasses ();
-    
-    lldb::SBTypeMember
-    GetFieldAtIndex (uint32_t idx);
-    
-    lldb::SBTypeMember
-    GetDirectBaseClassAtIndex (uint32_t idx);
-
-    lldb::SBTypeMember
-    GetVirtualBaseClassAtIndex (uint32_t idx);
-
-    lldb::SBTypeEnumMemberList
-    GetEnumMembers();
-
-    uint32_t
-    GetNumberOfTemplateArguments ();
-    
-    lldb::SBType
-    GetTemplateArgumentType (uint32_t idx);
-
-    lldb::TemplateArgumentKind
-    GetTemplateArgumentKind (uint32_t idx);
-
-    lldb::SBType
-    GetFunctionReturnType ();
-
-    lldb::SBTypeList
-    GetFunctionArgumentTypes ();
-    
-    uint32_t
-    GetNumberOfMemberFunctions ();
-    
-    lldb::SBTypeMemberFunction
-    GetMemberFunctionAtIndex (uint32_t idx);
-
-    const char*
-    GetName();
-    
-    const char *
-    GetDisplayTypeName ();
-    
-    lldb::TypeClass
-    GetTypeClass ();
-    
-    bool
-    IsTypeComplete ();
-    
-    uint32_t
-    GetTypeFlags ();
-
-    bool
-    GetDescription (lldb::SBStream &description, 
-                    lldb::DescriptionLevel description_level);
-
-    lldb::SBType &
-    operator = (const lldb::SBType &rhs);
-    
-    bool
-    operator == (lldb::SBType &rhs);
-    
-    bool
-    operator != (lldb::SBType &rhs);
-    
-protected:
-
-    lldb_private::TypeImpl &
-    ref ();
-    
-    const lldb_private::TypeImpl &
-    ref () const;
-    
-    lldb::TypeImplSP
-    GetSP ();
-
-    void
-    SetSP (const lldb::TypeImplSP &type_impl_sp);    
-
-    lldb::TypeImplSP m_opaque_sp;
-    
-    friend class SBFunction;
-    friend class SBModule;
-    friend class SBTarget;
-    friend class SBTypeEnumMember;
-    friend class SBTypeEnumMemberList;
-    friend class SBTypeNameSpecifier;
-    friend class SBTypeMember;
-    friend class SBTypeMemberFunction;
-    friend class SBTypeList;
-    friend class SBValue;
-        
-    SBType (const lldb_private::ClangASTType &);
-    SBType (const lldb::TypeSP &);
-    SBType (const lldb::TypeImplSP &);
-    
-};
-    
-class SBTypeList
-{
-public:
-    SBTypeList();
-    
-    SBTypeList(const lldb::SBTypeList& rhs);
-    
-    ~SBTypeList();
-
-    lldb::SBTypeList&
-    operator = (const lldb::SBTypeList& rhs);
-    
-    bool
-    IsValid();
-
-    void
-    Append (lldb::SBType type);
-    
-    lldb::SBType
-    GetTypeAtIndex (uint32_t index);
-    
-    uint32_t
-    GetSize();
-    
-    
-private:
-    std::unique_ptr<lldb_private::TypeListImpl> m_opaque_ap;
-    friend class SBModule;
-    friend class SBCompileUnit;
-};
-    
-
-} // namespace lldb
-
-#endif // LLDB_SBType_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h b/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
deleted file mode 100644
index 30c338b28a46..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeCategory.h
+++ /dev/null
@@ -1,168 +0,0 @@
-//===-- SBTypeCategory.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeCategory_h_
-#define LLDB_SBTypeCategory_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-    
-    class LLDB_API SBTypeCategory
-    {
-    public:
-        
-        SBTypeCategory();
-        
-        SBTypeCategory (const lldb::SBTypeCategory &rhs);
-        
-        ~SBTypeCategory ();
-        
-        bool
-        IsValid() const;
-        
-        bool
-        GetEnabled ();
-        
-        void
-        SetEnabled (bool);
-        
-        const char*
-        GetName();
-        
-        bool
-        GetDescription (lldb::SBStream &description, 
-                        lldb::DescriptionLevel description_level);
-        
-        uint32_t
-        GetNumFormats ();
-        
-        uint32_t
-        GetNumSummaries ();
-        
-        uint32_t
-        GetNumFilters ();
-        
-#ifndef LLDB_DISABLE_PYTHON
-        uint32_t
-        GetNumSynthetics ();
-#endif
-        
-        SBTypeNameSpecifier
-        GetTypeNameSpecifierForFilterAtIndex (uint32_t);
-        
-        SBTypeNameSpecifier
-        GetTypeNameSpecifierForFormatAtIndex (uint32_t);
-        
-        SBTypeNameSpecifier
-        GetTypeNameSpecifierForSummaryAtIndex (uint32_t);
-
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeNameSpecifier
-        GetTypeNameSpecifierForSyntheticAtIndex (uint32_t);
-#endif
-        
-        SBTypeFilter
-        GetFilterForType (SBTypeNameSpecifier);
-
-        SBTypeFormat
-        GetFormatForType (SBTypeNameSpecifier);
-        
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeSummary
-        GetSummaryForType (SBTypeNameSpecifier);
-#endif
-
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeSynthetic
-        GetSyntheticForType (SBTypeNameSpecifier);
-#endif
-        
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeFilter
-        GetFilterAtIndex (uint32_t);
-#endif
-        
-        SBTypeFormat
-        GetFormatAtIndex (uint32_t);
-        
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeSummary
-        GetSummaryAtIndex (uint32_t);
-#endif
-        
-#ifndef LLDB_DISABLE_PYTHON
-        SBTypeSynthetic
-        GetSyntheticAtIndex (uint32_t);
-#endif
-        
-        bool
-        AddTypeFormat (SBTypeNameSpecifier,
-                       SBTypeFormat);
-        
-        bool
-        DeleteTypeFormat (SBTypeNameSpecifier);
-        
-#ifndef LLDB_DISABLE_PYTHON
-        bool
-        AddTypeSummary (SBTypeNameSpecifier,
-                        SBTypeSummary);
-#endif
-        
-        bool
-        DeleteTypeSummary (SBTypeNameSpecifier);
-        
-        bool
-        AddTypeFilter (SBTypeNameSpecifier,
-                       SBTypeFilter);
-        
-        bool
-        DeleteTypeFilter (SBTypeNameSpecifier);
-        
-#ifndef LLDB_DISABLE_PYTHON
-        bool
-        AddTypeSynthetic (SBTypeNameSpecifier,
-                          SBTypeSynthetic);
-        
-        bool
-        DeleteTypeSynthetic (SBTypeNameSpecifier);
-#endif
-        
-        lldb::SBTypeCategory &
-        operator = (const lldb::SBTypeCategory &rhs);
-        
-        bool
-        operator == (lldb::SBTypeCategory &rhs);
-        
-        bool
-        operator != (lldb::SBTypeCategory &rhs);
-        
-    protected:
-        friend class SBDebugger;
-        
-        lldb::TypeCategoryImplSP
-        GetSP ();
-        
-        void
-        SetSP (const lldb::TypeCategoryImplSP &typecategory_impl_sp);    
-        
-        TypeCategoryImplSP m_opaque_sp;
-        
-        SBTypeCategory (const lldb::TypeCategoryImplSP &);
-        
-        SBTypeCategory (const char*);
-        
-        bool
-        IsDefaultCategory();
-        
-    };
-    
-} // namespace lldb
-
-#endif // LLDB_SBTypeCategory_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h b/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
deleted file mode 100644
index b141ba0a6bb0..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeEnumMember.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-//===-- SBTypeEnumMember.h --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeEnumMember_h_
-#define LLDB_SBTypeEnumMember_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBTypeEnumMember
-{
-public:
-    SBTypeEnumMember ();
-
-    SBTypeEnumMember (const SBTypeEnumMember& rhs);
-
-    ~SBTypeEnumMember();
-
-    SBTypeEnumMember&
-    operator = (const SBTypeEnumMember& rhs);
-
-    bool
-    IsValid() const;
-
-    int64_t
-    GetValueAsSigned();
-
-    uint64_t
-    GetValueAsUnsigned();
-
-    const char *
-    GetName ();
-
-    lldb::SBType
-    GetType ();
-
-    bool
-    GetDescription (lldb::SBStream &description,
-                    lldb::DescriptionLevel description_level);
-
-protected:
-    friend class SBType;
-    friend class SBTypeEnumMemberList;
-
-    void
-    reset (lldb_private::TypeEnumMemberImpl *);
-
-    lldb_private::TypeEnumMemberImpl &
-    ref ();
-
-    const lldb_private::TypeEnumMemberImpl &
-    ref () const;
-
-    lldb::TypeEnumMemberImplSP m_opaque_sp;
-
-    SBTypeEnumMember (const lldb::TypeEnumMemberImplSP &);
-};
-
-class SBTypeEnumMemberList
-{
-public:
-    SBTypeEnumMemberList();
-
-    SBTypeEnumMemberList(const SBTypeEnumMemberList& rhs);
-
-    ~SBTypeEnumMemberList();
-
-    SBTypeEnumMemberList&
-    operator = (const SBTypeEnumMemberList& rhs);
-
-    bool
-    IsValid();
-
-    void
-    Append (SBTypeEnumMember entry);
-
-    SBTypeEnumMember
-    GetTypeEnumMemberAtIndex (uint32_t index);
-
-    uint32_t
-    GetSize();
-
-
-private:
-    std::unique_ptr<lldb_private::TypeEnumMemberListImpl> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif // LLDB_SBTypeEnumMember_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h b/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
deleted file mode 100644
index f030b6a99b60..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeFilter.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//===-- SBTypeFilter.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeFilter_h_
-#define LLDB_SBTypeFilter_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-    
-    class LLDB_API SBTypeFilter
-    {
-    public:
-        
-        SBTypeFilter();
-        
-        SBTypeFilter (uint32_t options); // see lldb::eTypeOption values
-        
-        SBTypeFilter (const lldb::SBTypeFilter &rhs);
-        
-        ~SBTypeFilter ();
-        
-        bool
-        IsValid() const;
-
-        uint32_t
-        GetNumberOfExpressionPaths ();
-        
-        const char*
-        GetExpressionPathAtIndex (uint32_t i);
-        
-        bool
-        ReplaceExpressionPathAtIndex (uint32_t i, const char* item);
-        
-        void
-        AppendExpressionPath (const char* item);
-        
-        void
-        Clear();
-                
-        uint32_t
-        GetOptions();
-        
-        void
-        SetOptions (uint32_t);
-        
-        bool
-        GetDescription (lldb::SBStream &description, 
-                        lldb::DescriptionLevel description_level);
-        
-        lldb::SBTypeFilter &
-        operator = (const lldb::SBTypeFilter &rhs);
-        
-        bool
-        IsEqualTo (lldb::SBTypeFilter &rhs);
-        
-        bool
-        operator == (lldb::SBTypeFilter &rhs);
-
-        bool
-        operator != (lldb::SBTypeFilter &rhs);
-        
-    protected:
-        friend class SBDebugger;
-        friend class SBTypeCategory;
-        friend class SBValue;
-        
-        lldb::TypeFilterImplSP
-        GetSP ();
-        
-        void
-        SetSP (const lldb::TypeFilterImplSP &typefilter_impl_sp);    
-        
-        lldb::TypeFilterImplSP m_opaque_sp;
-        
-        SBTypeFilter (const lldb::TypeFilterImplSP &);
-        
-        bool
-        CopyOnWrite_Impl();
-        
-    };
-    
-    
-} // namespace lldb
-
-#endif // LLDB_SBTypeFilter_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h b/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
deleted file mode 100644
index c24641ac15f5..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeFormat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//===-- SBTypeFormat.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeFormat_h_
-#define LLDB_SBTypeFormat_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBTypeFormat
-{
-public:
-    
-    SBTypeFormat();
-    
-    SBTypeFormat (lldb::Format format,
-                  uint32_t options = 0); // see lldb::eTypeOption values
-
-    SBTypeFormat (const char* type,
-                  uint32_t options = 0); // see lldb::eTypeOption values
-    
-    SBTypeFormat (const lldb::SBTypeFormat &rhs);
-    
-    ~SBTypeFormat ();
-    
-    bool
-    IsValid() const;
-    
-    lldb::Format
-    GetFormat ();
-    
-    const char*
-    GetTypeName ();
-    
-    uint32_t
-    GetOptions();
-    
-    void
-    SetFormat (lldb::Format);
-    
-    void
-    SetTypeName (const char*);
-    
-    void
-    SetOptions (uint32_t);
-    
-    bool
-    GetDescription (lldb::SBStream &description, 
-                    lldb::DescriptionLevel description_level);
-    
-    lldb::SBTypeFormat &
-    operator = (const lldb::SBTypeFormat &rhs);
-    
-    bool
-    IsEqualTo (lldb::SBTypeFormat &rhs);
-
-    bool
-    operator == (lldb::SBTypeFormat &rhs);
-    
-    bool
-    operator != (lldb::SBTypeFormat &rhs);
-    
-protected:
-    friend class SBDebugger;
-    friend class SBTypeCategory;
-    friend class SBValue;
-    
-    lldb::TypeFormatImplSP
-    GetSP ();
-    
-    void
-    SetSP (const lldb::TypeFormatImplSP &typeformat_impl_sp);    
-    
-    lldb::TypeFormatImplSP m_opaque_sp;
-    
-    SBTypeFormat (const lldb::TypeFormatImplSP &);
-    
-    enum class Type
-    {
-        eTypeKeepSame,
-        eTypeFormat,
-        eTypeEnum
-    };
-    
-    bool
-    CopyOnWrite_Impl(Type);
-    
-};
-
-    
-} // namespace lldb
-
-#endif // LLDB_SBTypeFormat_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h b/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
deleted file mode 100644
index 71700a7123d5..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeNameSpecifier.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//===-- SBTypeNameSpecifier.h --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeNameSpecifier_h_
-#define LLDB_SBTypeNameSpecifier_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-    
-    class LLDB_API SBTypeNameSpecifier
-    {
-    public:
-        
-        SBTypeNameSpecifier();
-        
-        SBTypeNameSpecifier (const char* name,
-                             bool is_regex = false);
-
-        SBTypeNameSpecifier (SBType type);
-        
-        SBTypeNameSpecifier (const lldb::SBTypeNameSpecifier &rhs);
-        
-        ~SBTypeNameSpecifier ();
-        
-        bool
-        IsValid() const;
-        
-        const char*
-        GetName();
-        
-        SBType
-        GetType ();
-        
-        bool
-        IsRegex();
-        
-        bool
-        GetDescription (lldb::SBStream &description, 
-                        lldb::DescriptionLevel description_level);
-        
-        lldb::SBTypeNameSpecifier &
-        operator = (const lldb::SBTypeNameSpecifier &rhs);
-        
-        bool
-        IsEqualTo (lldb::SBTypeNameSpecifier &rhs);
-
-        bool
-        operator == (lldb::SBTypeNameSpecifier &rhs);
-        
-        bool
-        operator != (lldb::SBTypeNameSpecifier &rhs);
-        
-    protected:
-        friend class SBDebugger;
-        friend class SBTypeCategory;
-        
-        lldb::TypeNameSpecifierImplSP
-        GetSP ();
-        
-        void
-        SetSP (const lldb::TypeNameSpecifierImplSP &type_namespec_sp);    
-        
-        lldb::TypeNameSpecifierImplSP m_opaque_sp;
-        
-        SBTypeNameSpecifier (const lldb::TypeNameSpecifierImplSP &);
-    };
-    
-} // namespace lldb
-
-#endif // LLDB_SBTypeNameSpecifier_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h b/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
deleted file mode 100644
index 9b367ba5f982..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeSummary.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//===-- SBTypeSummary.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeSummary_h_
-#define LLDB_SBTypeSummary_h_
-
-#include "lldb/API/SBDefines.h"
-
-#ifndef LLDB_DISABLE_PYTHON
-
-namespace lldb {
-    class LLDB_API SBTypeSummaryOptions
-    {
-    public:
-        SBTypeSummaryOptions();
-
-        SBTypeSummaryOptions (const lldb::SBTypeSummaryOptions &rhs);
-        
-        SBTypeSummaryOptions (const lldb_private::TypeSummaryOptions *lldb_object_ptr);
-        
-        ~SBTypeSummaryOptions ();
-        
-        bool
-        IsValid ();
-        
-        lldb::LanguageType
-        GetLanguage ();
-        
-        lldb::TypeSummaryCapping
-        GetCapping ();
-        
-        void
-        SetLanguage (lldb::LanguageType);
-        
-        void
-        SetCapping (lldb::TypeSummaryCapping);
-        
-    protected:
-        friend class SBValue;
-        
-        lldb_private::TypeSummaryOptions *
-        operator->();
-        
-        const lldb_private::TypeSummaryOptions *
-        operator->() const;
-        
-        lldb_private::TypeSummaryOptions *
-        get ();
-        
-        lldb_private::TypeSummaryOptions &
-        ref();
-        
-        const lldb_private::TypeSummaryOptions &
-        ref() const;
-        
-        void
-        SetOptions (const lldb_private::TypeSummaryOptions *lldb_object_ptr);
-        
-    private:
-        std::unique_ptr<lldb_private::TypeSummaryOptions> m_opaque_ap;
-    };
-    
-    class SBTypeSummary
-    {
-    public:
-        
-        SBTypeSummary();
-        
-        static SBTypeSummary
-        CreateWithSummaryString (const char* data,
-                                 uint32_t options = 0); // see lldb::eTypeOption values
-        
-        static SBTypeSummary
-        CreateWithFunctionName (const char* data,
-                                uint32_t options = 0); // see lldb::eTypeOption values
-        
-        static SBTypeSummary
-        CreateWithScriptCode (const char* data,
-                              uint32_t options = 0); // see lldb::eTypeOption values
-        
-        SBTypeSummary (const lldb::SBTypeSummary &rhs);
-        
-        ~SBTypeSummary ();
-        
-        bool
-        IsValid() const;
-        
-        bool
-        IsFunctionCode();
-        
-        bool
-        IsFunctionName();
-        
-        bool
-        IsSummaryString();
-        
-        const char*
-        GetData ();
-        
-        void
-        SetSummaryString (const char* data);
-        
-        void
-        SetFunctionName (const char* data);
-        
-        void
-        SetFunctionCode (const char* data);
-        
-        uint32_t
-        GetOptions ();
-        
-        void
-        SetOptions (uint32_t);
-        
-        bool
-        GetDescription (lldb::SBStream &description, 
-                        lldb::DescriptionLevel description_level);
-        
-        lldb::SBTypeSummary &
-        operator = (const lldb::SBTypeSummary &rhs);
-        
-        bool
-        IsEqualTo (lldb::SBTypeSummary &rhs);
-
-        bool
-        operator == (lldb::SBTypeSummary &rhs);
-        
-        bool
-        operator != (lldb::SBTypeSummary &rhs);
-        
-    protected:
-        friend class SBDebugger;
-        friend class SBTypeCategory;
-        friend class SBValue;
-        
-        lldb::TypeSummaryImplSP
-        GetSP ();
-        
-        void
-        SetSP (const lldb::TypeSummaryImplSP &typefilter_impl_sp);    
-        
-        lldb::TypeSummaryImplSP m_opaque_sp;
-        
-        SBTypeSummary (const lldb::TypeSummaryImplSP &);
-        
-        bool
-        CopyOnWrite_Impl();
-        
-        bool
-        ChangeSummaryType (bool want_script);
-        
-    };
-    
-    
-} // namespace lldb
-
-#endif // LLDB_DISABLE_PYTHON
-
-#endif // LLDB_SBTypeSummary_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h b/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
deleted file mode 100644
index 5dd11757ba40..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBTypeSynthetic.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//===-- SBTypeSynthetic.h -----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBTypeSynthetic_h_
-#define LLDB_SBTypeSynthetic_h_
-
-#include "lldb/API/SBDefines.h"
-
-#ifndef LLDB_DISABLE_PYTHON
-
-namespace lldb {
-    
-    class LLDB_API SBTypeSynthetic
-    {
-    public:
-        
-        SBTypeSynthetic();
-        
-        static SBTypeSynthetic
-        CreateWithClassName (const char* data,
-                             uint32_t options = 0); // see lldb::eTypeOption values
-        
-        static SBTypeSynthetic
-        CreateWithScriptCode (const char* data,
-                              uint32_t options = 0); // see lldb::eTypeOption values
-        
-        SBTypeSynthetic (const lldb::SBTypeSynthetic &rhs);
-        
-        ~SBTypeSynthetic ();
-        
-        bool
-        IsValid() const;
-        
-        bool
-        IsClassCode();
-
-        bool
-        IsClassName();
-        
-        const char*
-        GetData ();
-        
-        void
-        SetClassName (const char* data);
-        
-        void
-        SetClassCode (const char* data);
-                
-        uint32_t
-        GetOptions ();
-        
-        void
-        SetOptions (uint32_t);
-        
-        bool
-        GetDescription (lldb::SBStream &description, 
-                        lldb::DescriptionLevel description_level);
-        
-        lldb::SBTypeSynthetic &
-        operator = (const lldb::SBTypeSynthetic &rhs);
-
-        bool
-        IsEqualTo (lldb::SBTypeSynthetic &rhs);
-        
-        bool
-        operator == (lldb::SBTypeSynthetic &rhs);
-        
-        bool
-        operator != (lldb::SBTypeSynthetic &rhs);
-        
-    protected:
-        friend class SBDebugger;
-        friend class SBTypeCategory;
-        friend class SBValue;
-        
-        lldb::ScriptedSyntheticChildrenSP
-        GetSP ();
-        
-        void
-        SetSP (const lldb::ScriptedSyntheticChildrenSP &typefilter_impl_sp);    
-        
-        lldb::ScriptedSyntheticChildrenSP m_opaque_sp;
-        
-        SBTypeSynthetic (const lldb::ScriptedSyntheticChildrenSP &);
-        
-        bool
-        CopyOnWrite_Impl();
-        
-    };
-    
-    
-} // namespace lldb
-
-#endif // LLDB_DISABLE_PYTHON
-
-#endif // LLDB_SBTypeSynthetic_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h b/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
deleted file mode 100644
index 9eae30739bb8..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBUnixSignals.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//===-- SBUnixSignals.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBUnixSignals_h_
-#define LLDB_SBUnixSignals_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBUnixSignals {
-public:
-    SBUnixSignals ();
-
-    SBUnixSignals (const lldb::SBUnixSignals &rhs);
-
-    ~SBUnixSignals();
-
-    const SBUnixSignals &
-    operator =(const lldb::SBUnixSignals &rhs);
-
-    void
-    Clear ();
-
-    bool
-    IsValid () const;
-
-    const char *
-    GetSignalAsCString (int32_t signo) const;
-
-    int32_t
-    GetSignalNumberFromName (const char *name) const;
-
-    bool
-    GetShouldSuppress (int32_t signo) const;
-
-    bool
-    SetShouldSuppress (int32_t signo,
-                       bool value);
-
-    bool
-    GetShouldStop (int32_t signo) const;
-
-    bool
-    SetShouldStop (int32_t signo,
-                   bool value);
-
-    bool
-    GetShouldNotify (int32_t signo) const;
-
-    bool
-    SetShouldNotify (int32_t signo, bool value);
-
-    int32_t
-    GetNumSignals () const;
-
-    int32_t
-    GetSignalAtIndex (int32_t index) const;
-
-protected:
-    friend class SBProcess;
-
-    SBUnixSignals (lldb::ProcessSP &process_sp);
-
-    lldb::ProcessSP
-    GetSP() const;
-
-    void
-    SetSP (const lldb::ProcessSP &process_sp);
-
-private:
-    lldb::ProcessWP m_opaque_wp;
-};
-
-
-} // namespace lldb
-
-#endif // LLDB_SBUnixSignals_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBValue.h b/kcov-38/external/lldb/include/lldb/API/SBValue.h
deleted file mode 100644
index a070b149f34f..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBValue.h
+++ /dev/null
@@ -1,504 +0,0 @@
-//===-- SBValue.h -----------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBValue_h_
-#define LLDB_SBValue_h_
-
-#include "lldb/API/SBData.h"
-#include "lldb/API/SBDefines.h"
-#include "lldb/API/SBType.h"
-
-class ValueImpl;
-class ValueLocker;
-
-namespace lldb {
-
-class LLDB_API SBValue
-{
-public:
-    SBValue ();
-
-    SBValue (const lldb::SBValue &rhs);
-
-    lldb::SBValue &
-    operator =(const lldb::SBValue &rhs);
-    
-    ~SBValue ();
-
-    bool
-    IsValid();
-    
-    void
-    Clear();
-    
-    SBError
-    GetError();
-
-    lldb::user_id_t
-    GetID ();
-    
-    const char *
-    GetName();
-
-    const char *
-    GetTypeName ();
-    
-    const char *
-    GetDisplayTypeName ();
-
-    size_t
-    GetByteSize ();
-
-    bool
-    IsInScope ();
-
-    lldb::Format
-    GetFormat ();
-    
-    void
-    SetFormat (lldb::Format format);
-
-    const char *
-    GetValue ();
-
-    int64_t
-    GetValueAsSigned (lldb::SBError& error, int64_t fail_value=0);
-    
-    uint64_t
-    GetValueAsUnsigned (lldb::SBError& error, uint64_t fail_value=0);
-    
-    int64_t
-    GetValueAsSigned(int64_t fail_value=0);
-    
-    uint64_t
-    GetValueAsUnsigned(uint64_t fail_value=0);
-
-    ValueType
-    GetValueType ();
-
-    // If you call this on a newly created ValueObject, it will always return false.
-    bool
-    GetValueDidChange ();
-
-    const char *
-    GetSummary ();
-    
-    const char *
-    GetSummary (lldb::SBStream& stream,
-                lldb::SBTypeSummaryOptions& options);
-    
-    const char *
-    GetObjectDescription ();
-    
-    const char *
-    GetTypeValidatorResult ();
-    
-    lldb::SBValue
-    GetDynamicValue (lldb::DynamicValueType use_dynamic);
-    
-    lldb::SBValue
-    GetStaticValue ();
-    
-    lldb::SBValue
-    GetNonSyntheticValue ();
-    
-    lldb::DynamicValueType
-    GetPreferDynamicValue ();
-    
-    void
-    SetPreferDynamicValue (lldb::DynamicValueType use_dynamic);
-    
-    bool
-    GetPreferSyntheticValue ();
-    
-    void
-    SetPreferSyntheticValue (bool use_synthetic);
-    
-    bool
-    IsDynamic ();
-    
-    bool
-    IsSynthetic ();
-
-    const char *
-    GetLocation ();
-
-    // Deprecated - use the one that takes SBError&
-    bool
-    SetValueFromCString (const char *value_str);
-
-    bool
-    SetValueFromCString (const char *value_str, lldb::SBError& error);
-    
-    lldb::SBTypeFormat
-    GetTypeFormat ();
-    
-#ifndef LLDB_DISABLE_PYTHON
-    lldb::SBTypeSummary
-    GetTypeSummary ();
-#endif
-
-    lldb::SBTypeFilter
-    GetTypeFilter ();
-    
-#ifndef LLDB_DISABLE_PYTHON
-    lldb::SBTypeSynthetic
-    GetTypeSynthetic ();
-#endif
-
-    lldb::SBValue
-    GetChildAtIndex (uint32_t idx);
-    
-    lldb::SBValue
-    CreateChildAtOffset (const char *name, uint32_t offset, lldb::SBType type);
-    
-    // Deprecated - use the expression evaluator to perform type casting
-    lldb::SBValue
-    Cast (lldb::SBType type);
-    
-    lldb::SBValue
-    CreateValueFromExpression (const char *name, const char* expression);
-    
-    lldb::SBValue
-    CreateValueFromExpression (const char *name, const char* expression, SBExpressionOptions &options);
-    
-    lldb::SBValue
-    CreateValueFromAddress (const char* name, 
-                            lldb::addr_t address, 
-                            lldb::SBType type);
-    
-    // this has no address! GetAddress() and GetLoadAddress() as well as AddressOf()
-    // on the return of this call all return invalid
-    lldb::SBValue
-    CreateValueFromData (const char* name,
-                         lldb::SBData data,
-                         lldb::SBType type);
-
-    //------------------------------------------------------------------
-    /// Get a child value by index from a value.
-    ///
-    /// Structs, unions, classes, arrays and pointers have child
-    /// values that can be access by index. 
-    ///
-    /// Structs and unions access child members using a zero based index
-    /// for each child member. For
-    /// 
-    /// Classes reserve the first indexes for base classes that have 
-    /// members (empty base classes are omitted), and all members of the
-    /// current class will then follow the base classes. 
-    ///
-    /// Pointers differ depending on what they point to. If the pointer
-    /// points to a simple type, the child at index zero
-    /// is the only child value available, unless \a synthetic_allowed 
-    /// is \b true, in which case the pointer will be used as an array
-    /// and can create 'synthetic' child values using positive or 
-    /// negative indexes. If the pointer points to an aggregate type 
-    /// (an array, class, union, struct), then the pointee is 
-    /// transparently skipped and any children are going to be the indexes
-    /// of the child values within the aggregate type. For example if
-    /// we have a 'Point' type and we have a SBValue that contains a
-    /// pointer to a 'Point' type, then the child at index zero will be
-    /// the 'x' member, and the child at index 1 will be the 'y' member
-    /// (the child at index zero won't be a 'Point' instance).
-    /// 
-    /// Arrays have a preset number of children that can be accessed by
-    /// index and will returns invalid child values for indexes that are
-    /// out of bounds unless the \a synthetic_allowed is \b true. In this
-    /// case the array can create 'synthetic' child values for indexes 
-    /// that aren't in the array bounds using positive or negative 
-    /// indexes.
-    ///
-    /// @param[in] idx
-    ///     The index of the child value to get
-    ///
-    /// @param[in] use_dynamic
-    ///     An enumeration that specifies whether to get dynamic values,
-    ///     and also if the target can be run to figure out the dynamic
-    ///     type of the child value.
-    ///
-    /// @param[in] can_create_synthetic
-    ///     If \b true, then allow child values to be created by index
-    ///     for pointers and arrays for indexes that normally wouldn't
-    ///     be allowed.
-    ///
-    /// @return
-    ///     A new SBValue object that represents the child member value.
-    //------------------------------------------------------------------
-    lldb::SBValue
-    GetChildAtIndex (uint32_t idx, 
-                     lldb::DynamicValueType use_dynamic,
-                     bool can_create_synthetic);
-
-    // Matches children of this object only and will match base classes and
-    // member names if this is a clang typed object.
-    uint32_t
-    GetIndexOfChildWithName (const char *name);
-
-    // Matches child members of this object and child members of any base
-    // classes.
-    lldb::SBValue
-    GetChildMemberWithName (const char *name);
-
-    // Matches child members of this object and child members of any base
-    // classes.
-    lldb::SBValue
-    GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dynamic);
-    
-    // Expands nested expressions like .a->b[0].c[1]->d
-    lldb::SBValue
-    GetValueForExpressionPath(const char* expr_path);
-    
-    lldb::SBValue
-    AddressOf();
-    
-    lldb::addr_t
-    GetLoadAddress();
-    
-    lldb::SBAddress
-    GetAddress();
-
-    //------------------------------------------------------------------
-    /// Get an SBData wrapping what this SBValue points to.
-    ///
-    /// This method will dereference the current SBValue, if its
-    /// data type is a T* or T[], and extract item_count elements
-    /// of type T from it, copying their contents in an SBData. 
-    ///
-    /// @param[in] item_idx
-    ///     The index of the first item to retrieve. For an array
-    ///     this is equivalent to array[item_idx], for a pointer
-    ///     to *(pointer + item_idx). In either case, the measurement
-    ///     unit for item_idx is the sizeof(T) rather than the byte
-    ///
-    /// @param[in] item_count
-    ///     How many items should be copied into the output. By default
-    ///     only one item is copied, but more can be asked for.
-    ///
-    /// @return
-    ///     An SBData with the contents of the copied items, on success.
-    ///     An empty SBData otherwise.
-    //------------------------------------------------------------------
-    lldb::SBData
-    GetPointeeData (uint32_t item_idx = 0,
-                    uint32_t item_count = 1);
-    
-    //------------------------------------------------------------------
-    /// Get an SBData wrapping the contents of this SBValue.
-    ///
-    /// This method will read the contents of this object in memory
-    /// and copy them into an SBData for future use. 
-    ///
-    /// @return
-    ///     An SBData with the contents of this SBValue, on success.
-    ///     An empty SBData otherwise.
-    //------------------------------------------------------------------
-    lldb::SBData
-    GetData ();
-    
-    bool
-    SetData (lldb::SBData &data, lldb::SBError& error);
-    
-    lldb::SBDeclaration
-    GetDeclaration ();
-    
-    //------------------------------------------------------------------
-    /// Find out if a SBValue might have children.
-    ///
-    /// This call is much more efficient than GetNumChildren() as it
-    /// doesn't need to complete the underlying type. This is designed
-    /// to be used in a UI environment in order to detect if the
-    /// disclosure triangle should be displayed or not.
-    ///
-    /// This function returns true for class, union, structure,
-    /// pointers, references, arrays and more. Again, it does so without
-    /// doing any expensive type completion.
-    ///
-    /// @return
-    ///     Returns \b true if the SBValue might have children, or \b
-    ///     false otherwise.
-    //------------------------------------------------------------------
-    bool
-    MightHaveChildren ();
-    
-    bool
-    IsRuntimeSupportValue ();
-
-    uint32_t
-    GetNumChildren ();
-
-    void *
-    GetOpaqueType();
-
-    lldb::SBTarget
-    GetTarget();
-    
-    lldb::SBProcess
-    GetProcess();
-    
-    lldb::SBThread
-    GetThread();
-
-    lldb::SBFrame
-    GetFrame();
-    
-    lldb::SBValue
-    Dereference ();
-
-    bool
-    TypeIsPointerType ();
-    
-    lldb::SBType
-    GetType();
-    
-    lldb::SBValue
-    Persist ();
-
-    bool
-    GetDescription (lldb::SBStream &description);
-
-    bool
-    GetExpressionPath (lldb::SBStream &description);
-    
-    bool
-    GetExpressionPath (lldb::SBStream &description, 
-                       bool qualify_cxx_base_classes);
-
-    SBValue (const lldb::ValueObjectSP &value_sp);
-
-    //------------------------------------------------------------------
-    /// Watch this value if it resides in memory.
-    ///
-    /// Sets a watchpoint on the value.
-    ///
-    /// @param[in] resolve_location
-    ///     Resolve the location of this value once and watch its address.
-    ///     This value must currently be set to \b true as watching all
-    ///     locations of a variable or a variable path is not yet supported,
-    ///     though we plan to support it in the future.
-    ///
-    /// @param[in] read
-    ///     Stop when this value is accessed.
-    ///
-    /// @param[in] write
-    ///     Stop when this value is modified
-    ///
-    /// @param[out] error
-    ///     An error object. Contains the reason if there is some failure.
-    ///
-    /// @return
-    ///     An SBWatchpoint object. This object might not be valid upon
-    ///     return due to a value not being contained in memory, too 
-    ///     large, or watchpoint resources are not available or all in
-    ///     use.
-    //------------------------------------------------------------------
-    lldb::SBWatchpoint
-    Watch (bool resolve_location, bool read, bool write, SBError &error);
-
-    // Backward compatibility fix in the interim.
-    lldb::SBWatchpoint
-    Watch (bool resolve_location, bool read, bool write);
-
-    //------------------------------------------------------------------
-    /// Watch this value that this value points to in memory
-    ///
-    /// Sets a watchpoint on the value.
-    ///
-    /// @param[in] resolve_location
-    ///     Resolve the location of this value once and watch its address.
-    ///     This value must currently be set to \b true as watching all
-    ///     locations of a variable or a variable path is not yet supported,
-    ///     though we plan to support it in the future.
-    ///
-    /// @param[in] read
-    ///     Stop when this value is accessed.
-    ///
-    /// @param[in] write
-    ///     Stop when this value is modified
-    ///
-    /// @param[out] error
-    ///     An error object. Contains the reason if there is some failure.
-    ///
-    /// @return
-    ///     An SBWatchpoint object. This object might not be valid upon
-    ///     return due to a value not being contained in memory, too 
-    ///     large, or watchpoint resources are not available or all in
-    ///     use.
-    //------------------------------------------------------------------
-    lldb::SBWatchpoint
-    WatchPointee (bool resolve_location, bool read, bool write, SBError &error);
-
-    //------------------------------------------------------------------
-    /// Same as the protected version of GetSP that takes a locker, except that we make the
-    /// locker locally in the function.  Since the Target API mutex is recursive, and the
-    /// StopLocker is a read lock, you can call this function even if you are already
-    /// holding the two above-mentioned locks.
-    ///
-    /// @return
-    ///     A ValueObjectSP of the best kind (static, dynamic or synthetic) we
-    ///     can cons up, in accordance with the SBValue's settings.
-    //------------------------------------------------------------------
-    lldb::ValueObjectSP
-    GetSP () const;
-
-protected:
-    friend class SBBlock;
-    friend class SBFrame;
-    friend class SBTarget;
-    friend class SBThread;
-    friend class SBValueList;
-
-    //------------------------------------------------------------------
-    /// Get the appropriate ValueObjectSP from this SBValue, consulting the
-    /// use_dynamic and use_synthetic options passed in to SetSP when the
-    /// SBValue's contents were set.  Since this often requires examining memory,
-    /// and maybe even running code, it needs to acquire the Target API and Process StopLock.
-    /// Those are held in an opaque class ValueLocker which is currently local to SBValue.cpp.
-    /// So you don't have to get these yourself just default construct a ValueLocker, and pass it into this.
-    /// If we need to make a ValueLocker and use it in some other .cpp file, we'll have to move it to
-    /// ValueObject.h/cpp or somewhere else convenient.  We haven't needed to so far.
-    ///
-    /// @param[in] value_locker
-    ///     An object that will hold the Target API, and Process RunLocks, and
-    ///     auto-destroy them when it goes out of scope.  Currently this is only useful in
-    ///     SBValue.cpp.
-    ///
-    /// @return
-    ///     A ValueObjectSP of the best kind (static, dynamic or synthetic) we
-    ///     can cons up, in accordance with the SBValue's settings.
-    //------------------------------------------------------------------
-    lldb::ValueObjectSP
-    GetSP (ValueLocker &value_locker) const;
-    
-    // these calls do the right thing WRT adjusting their settings according to the target's preferences
-    void
-    SetSP (const lldb::ValueObjectSP &sp);
-
-    void
-    SetSP (const lldb::ValueObjectSP &sp, bool use_synthetic);
-    
-    void
-    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic);
-
-    void
-    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic, bool use_synthetic);
-    
-    void
-    SetSP (const lldb::ValueObjectSP &sp, lldb::DynamicValueType use_dynamic, bool use_synthetic, const char *name);
-    
-private:
-    typedef std::shared_ptr<ValueImpl> ValueImplSP;
-    ValueImplSP m_opaque_sp;
-    
-    void
-    SetSP (ValueImplSP impl_sp);
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBValue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBValueList.h b/kcov-38/external/lldb/include/lldb/API/SBValueList.h
deleted file mode 100644
index 563ca3d7e1bf..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBValueList.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//===-- SBValueList.h -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBValueList_h_
-#define LLDB_SBValueList_h_
-
-#include "lldb/API/SBDefines.h"
-
-class ValueListImpl;
-
-namespace lldb {
-
-class LLDB_API SBValueList
-{
-public:
-
-    SBValueList ();
-
-    SBValueList (const lldb::SBValueList &rhs);
-
-    ~SBValueList();
-
-    bool
-    IsValid() const;
-    
-    void
-    Clear();
-
-    void
-    Append (const lldb::SBValue &val_obj);
-
-    void
-    Append (const lldb::SBValueList& value_list);
-
-    uint32_t
-    GetSize() const;
-
-    lldb::SBValue
-    GetValueAtIndex (uint32_t idx) const;
-    
-    lldb::SBValue
-    GetFirstValueByName (const char* name) const;
-
-    lldb::SBValue
-    FindValueObjectByUID (lldb::user_id_t uid);
-
-    const lldb::SBValueList &
-    operator = (const lldb::SBValueList &rhs);
-
-protected:
-    
-    // only useful for visualizing the pointer or comparing two SBValueLists
-    // to see if they are backed by the same underlying Impl.
-    void *
-    opaque_ptr ();
-
-private:
-    friend class SBFrame;
-    
-    SBValueList (const ValueListImpl *lldb_object_ptr);
-
-    void
-    Append (lldb::ValueObjectSP& val_obj_sp);
-
-    void
-    CreateIfNeeded ();
-
-    ValueListImpl *
-    operator -> ();
-    
-    ValueListImpl &
-    operator* ();
-    
-    const ValueListImpl *
-    operator -> () const;
-    
-    const ValueListImpl &
-    operator* () const;
-    
-    
-    ValueListImpl &
-    ref ();
-    
-    std::unique_ptr<ValueListImpl> m_opaque_ap;
-};
-
-
-} // namespace lldb
-
-#endif  // LLDB_SBValueList_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h b/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
deleted file mode 100644
index 527310f5dfc7..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBVariablesOptions.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//===-- SBVariablesOptions.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBVariablesOptions_h_
-#define LLDB_SBVariablesOptions_h_
-
-#include "lldb/API/SBDefines.h"
-
-class VariablesOptionsImpl;
-
-namespace lldb {
-
-class LLDB_API SBVariablesOptions
-{
-public:
-    SBVariablesOptions ();
-    
-    SBVariablesOptions (const SBVariablesOptions& options);
-    
-    SBVariablesOptions&
-    operator = (const SBVariablesOptions& options);
-    
-    ~SBVariablesOptions ();
-    
-    bool
-    IsValid () const;
-    
-    bool
-    GetIncludeArguments () const;
-    
-    void
-    SetIncludeArguments (bool);
-    
-    bool
-    GetIncludeLocals () const;
-    
-    void
-    SetIncludeLocals (bool);
-    
-    bool
-    GetIncludeStatics () const;
-    
-    void
-    SetIncludeStatics (bool);
-    
-    bool
-    GetInScopeOnly () const;
-    
-    void
-    SetInScopeOnly (bool);
-    
-    bool
-    GetIncludeRuntimeSupportValues () const;
-    
-    void
-    SetIncludeRuntimeSupportValues (bool);
-    
-    lldb::DynamicValueType
-    GetUseDynamic () const;
-    
-    void
-    SetUseDynamic (lldb::DynamicValueType);
-    
-protected:
-    VariablesOptionsImpl *
-    operator->();
-    
-    const VariablesOptionsImpl *
-    operator->() const;
-    
-    VariablesOptionsImpl *
-    get ();
-    
-    VariablesOptionsImpl &
-    ref();
-    
-    const VariablesOptionsImpl &
-    ref() const;
-    
-    SBVariablesOptions (VariablesOptionsImpl *lldb_object_ptr);
-    
-    void
-    SetOptions (VariablesOptionsImpl *lldb_object_ptr);
-    
-private:
-    
-    std::unique_ptr<VariablesOptionsImpl> m_opaque_ap;
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBValue_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h b/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
deleted file mode 100644
index 5d0d48ee12f2..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SBWatchpoint.h
+++ /dev/null
@@ -1,104 +0,0 @@
-//===-- SBWatchpoint.h ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_SBWatchpoint_h_
-#define LLDB_SBWatchpoint_h_
-
-#include "lldb/API/SBDefines.h"
-
-namespace lldb {
-
-class LLDB_API SBWatchpoint
-{
-public:
-
-    SBWatchpoint ();
-
-    SBWatchpoint (const lldb::SBWatchpoint &rhs);
-
-    SBWatchpoint (const lldb::WatchpointSP &wp_sp);
-
-    ~SBWatchpoint ();
-
-    const lldb::SBWatchpoint &
-    operator = (const lldb::SBWatchpoint &rhs);
-
-    bool
-    IsValid() const;
-
-    SBError
-    GetError();
-
-    watch_id_t
-    GetID ();
-
-    /// With -1 representing an invalid hardware index.
-    int32_t
-    GetHardwareIndex ();
-
-    lldb::addr_t
-    GetWatchAddress ();
-
-    size_t
-    GetWatchSize();
-
-    void
-    SetEnabled(bool enabled);
-
-    bool
-    IsEnabled ();
-
-    uint32_t
-    GetHitCount ();
-
-    uint32_t
-    GetIgnoreCount ();
-
-    void
-    SetIgnoreCount (uint32_t n);
-
-    const char *
-    GetCondition ();
-
-    void 
-    SetCondition (const char *condition);
-    
-    bool
-    GetDescription (lldb::SBStream &description, DescriptionLevel level);
-
-    void
-    Clear ();
-
-    lldb::WatchpointSP
-    GetSP () const;
-
-    void
-    SetSP (const lldb::WatchpointSP &sp);
-
-    static bool
-    EventIsWatchpointEvent (const lldb::SBEvent &event);
-    
-    static lldb::WatchpointEventType
-    GetWatchpointEventTypeFromEvent (const lldb::SBEvent& event);
-
-    static lldb::SBWatchpoint
-    GetWatchpointFromEvent (const lldb::SBEvent& event);
-
-private:
-    friend class SBTarget;
-    friend class SBValue;
-
-    
-    lldb::WatchpointSP m_opaque_sp;
-
-};
-
-} // namespace lldb
-
-#endif  // LLDB_SBWatchpoint_h_
diff --git a/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h b/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
deleted file mode 100644
index 6280fe8aef04..000000000000
--- a/kcov-38/external/lldb/include/lldb/API/SystemInitializerFull.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//===-- SystemInitializerFull.h ---------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_API_SYSTEM_INITIALIZER_FULL_H
-#define LLDB_API_SYSTEM_INITIALIZER_FULL_H
-
-#include "lldb/Initialization/SystemInitializerCommon.h"
-
-namespace lldb_private
-{
-//------------------------------------------------------------------
-/// Initializes lldb.
-///
-/// This class is responsible for initializing all of lldb system
-/// services needed to use the full LLDB application.  This class is
-/// not intended to be used externally, but is instead used
-/// internally by SBDebugger to initialize the system.
-//------------------------------------------------------------------
-class SystemInitializerFull : public SystemInitializerCommon
-{
-  public:
-    SystemInitializerFull();
-    virtual ~SystemInitializerFull();
-
-    void Initialize() override;
-    void Terminate() override;
-
-  private:
-    void InitializeSWIG();
-    void TerminateSWIG();
-};
-}
-
-#endif
diff --git a/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h b/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
deleted file mode 100644
index 5c77dad9f7ff..000000000000
--- a/kcov-38/external/lldb/include/lldb/Utility/SharingPtr.h
+++ /dev/null
@@ -1,841 +0,0 @@
-//===---------------------SharingPtr.h --------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef utility_SharingPtr_h_
-#define utility_SharingPtr_h_
-
-#include <algorithm>
-#include <memory>
-
-// Microsoft Visual C++ currently does not enable std::atomic to work
-// in CLR mode - as such we need to "hack around it" for MSVC++ builds only
-// using Windows specific intrinsics instead of the C++11 atomic support
-#ifdef _MSC_VER
-#include <intrin.h>
-#else
-#include <atomic>
-#endif
-
-//#define ENABLE_SP_LOGGING 1 // DON'T CHECK THIS LINE IN UNLESS COMMENTED OUT
-#if defined (ENABLE_SP_LOGGING)
-
-extern "C" void track_sp (void *sp_this, void *ptr, long count);
-
-#endif
-
-namespace lldb_private {
-
-namespace imp {
-    
-class shared_count
-{
-    shared_count(const shared_count&);
-    shared_count& operator=(const shared_count&);
-
-protected:
-#ifdef _MSC_VER
-    long shared_owners_;
-#else
-    std::atomic<long> shared_owners_;
-#endif
-    virtual ~shared_count();
-private:
-    virtual void on_zero_shared() = 0;
-
-public:
-    explicit shared_count(long refs = 0)
-        : shared_owners_(refs) {}
-
-    void add_shared();
-    void release_shared();
-    long use_count() const {return shared_owners_ + 1;}
-};
-
-template <class T>
-class shared_ptr_pointer
-    : public shared_count
-{
-    T data_;
-public:
-    shared_ptr_pointer(T p)
-        :  data_(p) {}
-
-private:
-    virtual void on_zero_shared();
-
-    // Outlaw copy constructor and assignment operator to keep effective C++
-    // warnings down to a minimum
-    shared_ptr_pointer (const shared_ptr_pointer &);
-    shared_ptr_pointer & operator=(const shared_ptr_pointer &);
-};
-
-template <class T>
-void
-shared_ptr_pointer<T>::on_zero_shared()
-{
-    delete data_;
-}
-
-template <class T>
-class shared_ptr_emplace
-    : public shared_count
-{
-    T data_;
-public:
-
-    shared_ptr_emplace()
-        :  data_() {}
-
-    template <class A0>
-        shared_ptr_emplace(A0& a0)
-            :  data_(a0) {}
-
-    template <class A0, class A1>
-        shared_ptr_emplace(A0& a0, A1& a1)
-            :  data_(a0, a1) {}
-
-    template <class A0, class A1, class A2>
-        shared_ptr_emplace(A0& a0, A1& a1, A2& a2)
-            :  data_(a0, a1, a2) {}
-
-    template <class A0, class A1, class A2, class A3>
-        shared_ptr_emplace(A0& a0, A1& a1, A2& a2, A3& a3)
-            :  data_(a0, a1, a2, a3) {}
-
-    template <class A0, class A1, class A2, class A3, class A4>
-        shared_ptr_emplace(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
-            :  data_(a0, a1, a2, a3, a4) {}
-
-private:
-    virtual void on_zero_shared();
-public:
-    T* get() {return &data_;}
-};
-
-template <class T>
-void
-shared_ptr_emplace<T>::on_zero_shared()
-{
-}
-
-}  // namespace
-
-template<class T>
-class SharingPtr
-{
-public: 
-    typedef T element_type; 
-private:
-    element_type*      ptr_;
-    imp::shared_count* cntrl_;
-
-    struct nat {int for_bool_;};
-public:
-    SharingPtr();
-    SharingPtr(std::nullptr_t);
-    template<class Y> explicit SharingPtr(Y* p);
-    template<class Y> explicit SharingPtr(Y* p, imp::shared_count *ctrl_block);
-    template<class Y> SharingPtr(const SharingPtr<Y>& r, element_type *p); 
-    SharingPtr(const SharingPtr& r);
-    template<class Y>
-        SharingPtr(const SharingPtr<Y>& r);
-
-    ~SharingPtr();
-
-    SharingPtr& operator=(const SharingPtr& r); 
-    template<class Y> SharingPtr& operator=(const SharingPtr<Y>& r); 
-
-    void swap(SharingPtr& r);
-    void reset();
-    template<class Y> void reset(Y* p);
-    void reset(std::nullptr_t);
-
-    element_type* get() const {return ptr_;}
-    element_type& operator*() const {return *ptr_;}
-    element_type* operator->() const {return ptr_;}
-    long use_count() const {return cntrl_ ? cntrl_->use_count() : 0;}
-    bool unique() const {return use_count() == 1;}
-    bool empty() const {return cntrl_ == 0;}
-    operator nat*() const {return (nat*)get();}
-
-    static SharingPtr<T> make_shared();
-
-    template<class A0>
-        static SharingPtr<T> make_shared(A0&);
-
-    template<class A0, class A1>
-        static SharingPtr<T> make_shared(A0&, A1&);
-
-    template<class A0, class A1, class A2>
-        static SharingPtr<T> make_shared(A0&, A1&, A2&);
-
-    template<class A0, class A1, class A2, class A3>
-        static SharingPtr<T> make_shared(A0&, A1&, A2&, A3&);
-
-    template<class A0, class A1, class A2, class A3, class A4>
-        static SharingPtr<T> make_shared(A0&, A1&, A2&, A3&, A4&);
-
-private:
-
-    template <class U> friend class SharingPtr;
-};
-
-template<class T>
-inline
-SharingPtr<T>::SharingPtr()
-    : ptr_(0),
-      cntrl_(0)
-{
-}
-    
-template<class T>
-inline
-SharingPtr<T>::SharingPtr(std::nullptr_t)
-: ptr_(0),
-cntrl_(0)
-{
-}
-
-template<class T>
-template<class Y>
-SharingPtr<T>::SharingPtr(Y* p)
-    : ptr_(p), cntrl_(0)
-{
-    std::unique_ptr<Y> hold(p);
-    typedef imp::shared_ptr_pointer<Y*> _CntrlBlk;
-    cntrl_ = new _CntrlBlk(p);
-    hold.release();
-}
-
-template<class T>
-template<class Y>
-SharingPtr<T>::SharingPtr(Y* p, imp::shared_count *cntrl_block)
-    : ptr_(p), cntrl_(cntrl_block)
-{
-}
-
-template<class T>
-template<class Y>
-inline
-SharingPtr<T>::SharingPtr(const SharingPtr<Y>& r, element_type *p)
-    : ptr_(p),
-      cntrl_(r.cntrl_)
-{
-    if (cntrl_)
-        cntrl_->add_shared();
-}
-
-template<class T>
-inline
-SharingPtr<T>::SharingPtr(const SharingPtr& r)
-    : ptr_(r.ptr_),
-      cntrl_(r.cntrl_)
-{
-    if (cntrl_)
-        cntrl_->add_shared();
-}
-
-template<class T>
-template<class Y>
-inline
-SharingPtr<T>::SharingPtr(const SharingPtr<Y>& r)
-    : ptr_(r.ptr_),
-      cntrl_(r.cntrl_)
-{
-    if (cntrl_)
-        cntrl_->add_shared();
-}
-
-template<class T>
-SharingPtr<T>::~SharingPtr()
-{
-    if (cntrl_)
-        cntrl_->release_shared();
-}
-
-template<class T>
-inline
-SharingPtr<T>&
-SharingPtr<T>::operator=(const SharingPtr& r)
-{
-    SharingPtr(r).swap(*this);
-    return *this;
-}
-
-template<class T>
-template<class Y>
-inline
-SharingPtr<T>&
-SharingPtr<T>::operator=(const SharingPtr<Y>& r)
-{
-    SharingPtr(r).swap(*this);
-    return *this;
-}
-
-template<class T>
-inline
-void
-SharingPtr<T>::swap(SharingPtr& r)
-{
-    std::swap(ptr_, r.ptr_);
-    std::swap(cntrl_, r.cntrl_);
-}
-
-template<class T>
-inline
-void
-SharingPtr<T>::reset()
-{
-    SharingPtr().swap(*this);
-}
-
-template<class T>
-inline
-void
-SharingPtr<T>::reset (std::nullptr_t p)
-{
-    reset();
-}
-    
-template<class T>
-template<class Y>
-inline
-void
-SharingPtr<T>::reset(Y* p)
-{
-    SharingPtr(p).swap(*this);
-}
-
-template<class T>
-SharingPtr<T>
-SharingPtr<T>::make_shared()
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk();
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-template<class A0>
-SharingPtr<T>
-SharingPtr<T>::make_shared(A0& a0)
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk(a0);
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-template<class A0, class A1>
-SharingPtr<T>
-SharingPtr<T>::make_shared(A0& a0, A1& a1)
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk(a0, a1);
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-template<class A0, class A1, class A2>
-SharingPtr<T>
-SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2)
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk(a0, a1, a2);
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-template<class A0, class A1, class A2, class A3>
-SharingPtr<T>
-SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2, A3& a3)
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk(a0, a1, a2, a3);
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-template<class A0, class A1, class A2, class A3, class A4>
-SharingPtr<T>
-SharingPtr<T>::make_shared(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
-{
-    typedef imp::shared_ptr_emplace<T> CntrlBlk;
-    SharingPtr<T> r;
-    r.cntrl_ = new CntrlBlk(a0, a1, a2, a3, a4);
-    r.ptr_ = static_cast<CntrlBlk*>(r.cntrl_)->get();
-    return r;
-}
-
-template<class T>
-inline
-SharingPtr<T>
-make_shared()
-{
-    return SharingPtr<T>::make_shared();
-}
-
-template<class T, class A0>
-inline
-SharingPtr<T>
-make_shared(A0& a0)
-{
-    return SharingPtr<T>::make_shared(a0);
-}
-
-template<class T, class A0, class A1>
-inline
-SharingPtr<T>
-make_shared(A0& a0, A1& a1)
-{
-    return SharingPtr<T>::make_shared(a0, a1);
-}
-
-template<class T, class A0, class A1, class A2>
-inline
-SharingPtr<T>
-make_shared(A0& a0, A1& a1, A2& a2)
-{
-    return SharingPtr<T>::make_shared(a0, a1, a2);
-}
-
-template<class T, class A0, class A1, class A2, class A3>
-inline
-SharingPtr<T>
-make_shared(A0& a0, A1& a1, A2& a2, A3& a3)
-{
-    return SharingPtr<T>::make_shared(a0, a1, a2, a3);
-}
-
-template<class T, class A0, class A1, class A2, class A3, class A4>
-inline
-SharingPtr<T>
-make_shared(A0& a0, A1& a1, A2& a2, A3& a3, A4& a4)
-{
-    return SharingPtr<T>::make_shared(a0, a1, a2, a3, a4);
-}
-
-
-template<class T, class U>
-inline
-bool
-operator==(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
-{
-    return __x.get() == __y.get();
-}
-
-template<class T, class U>
-inline
-bool
-operator!=(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
-{
-    return !(__x == __y);
-}
-
-template<class T, class U>
-inline
-bool
-operator<(const SharingPtr<T>& __x, const SharingPtr<U>& __y)
-{
-    return __x.get() < __y.get();
-}
-
-template<class T>
-inline
-void
-swap(SharingPtr<T>& __x, SharingPtr<T>& __y)
-{
-    __x.swap(__y);
-}
-
-template<class T, class U>
-inline
-SharingPtr<T>
-static_pointer_cast(const SharingPtr<U>& r)
-{
-    return SharingPtr<T>(r, static_cast<T*>(r.get()));
-}
-
-template<class T, class U>
-SharingPtr<T>
-const_pointer_cast(const SharingPtr<U>& r)
-{
-    return SharingPtr<T>(r, const_cast<T*>(r.get()));
-}
-
-template <class T>
-class LoggingSharingPtr
-    : public SharingPtr<T>
-{
-    typedef SharingPtr<T> base;
-
-public:
-    typedef void (*Callback)(void*, const LoggingSharingPtr&, bool action);
-    // action:  false means increment just happened
-    //          true  means decrement is about to happen
-
-private:
-    Callback cb_;
-    void* baton_;
-
-public:
-    LoggingSharingPtr() : cb_(0), baton_(0) {}
-    LoggingSharingPtr(Callback cb, void* baton)
-        : cb_(cb), baton_(baton)
-    {
-        if (cb_)
-            cb_(baton_, *this, false);
-    }
-
-    template <class Y>
-    LoggingSharingPtr(Y* p)
-        : base(p), cb_(0), baton_(0) {}
-
-    template <class Y>
-    LoggingSharingPtr(Y* p, Callback cb, void* baton)
-        : base(p), cb_(cb), baton_(baton)
-    {
-        if (cb_)
-            cb_(baton_, *this, false);
-    }
-
-    ~LoggingSharingPtr()
-    {
-        if (cb_)
-            cb_(baton_, *this, true);
-    }
-
-    LoggingSharingPtr(const LoggingSharingPtr& p)
-        : base(p), cb_(p.cb_), baton_(p.baton_)
-    {
-        if (cb_)
-            cb_(baton_, *this, false);
-    }
-
-    LoggingSharingPtr& operator=(const LoggingSharingPtr& p)
-    {
-        if (cb_)
-            cb_(baton_, *this, true);
-        base::operator=(p);
-        cb_ = p.cb_;
-        baton_ = p.baton_;
-        if (cb_)
-            cb_(baton_, *this, false);
-        return *this;
-    }
-
-    void reset()
-    {
-        if (cb_)
-            cb_(baton_, *this, true);
-        base::reset();
-    }
-
-    template <class Y>
-    void reset(Y* p)
-    {
-        if (cb_)
-            cb_(baton_, *this, true);
-        base::reset(p);
-        if (cb_)
-            cb_(baton_, *this, false);
-    }
-    
-    void SetCallback(Callback cb, void* baton)
-    {
-        cb_ = cb;
-        baton_ = baton;
-    }
-
-    void ClearCallback()
-    {
-        cb_ = 0;
-        baton_ = 0;
-    }
-};
-    
-    
-template <class T>
-class IntrusiveSharingPtr;
-
-template <class T>
-class ReferenceCountedBase
-{
-public:
-    explicit ReferenceCountedBase()
-        : shared_owners_(-1) 
-    {
-    }
-    
-    void
-    add_shared();
-
-    void
-    release_shared();
-
-    long 
-    use_count() const 
-    {
-        return shared_owners_ + 1;
-    }
-    
-protected:
-    long shared_owners_;
-   
-    friend class IntrusiveSharingPtr<T>;
-    
-private:
-    ReferenceCountedBase(const ReferenceCountedBase&);
-    ReferenceCountedBase& operator=(const ReferenceCountedBase&);
-};
-
-    template <class T>
-    void
-    lldb_private::ReferenceCountedBase<T>::add_shared()
-    {
-#ifdef _MSC_VER
-        _InterlockedIncrement(&shared_owners_);
-#else
-        ++shared_owners_;
-#endif
-    }
-    
-    template <class T>
-    void
-    lldb_private::ReferenceCountedBase<T>::release_shared()
-    {
-#ifdef _MSC_VER
-        if (_InterlockedDecrement(&shared_owners_) == -1)
-#else
-        if (--shared_owners_ == -1)
-#endif
-            delete static_cast<T*>(this);
-    }
-
-    
-template <class T>
-class ReferenceCountedBaseVirtual : public imp::shared_count
-{
-public:
-    explicit ReferenceCountedBaseVirtual () : 
-        imp::shared_count(-1)
-    {
-    }
-    
-    virtual
-    ~ReferenceCountedBaseVirtual ()
-    {
-    }
-    
-    virtual void on_zero_shared ();
-    
-};
-
-template <class T>
-void
-ReferenceCountedBaseVirtual<T>::on_zero_shared()
-{
-}
-
-template <typename T>
-class IntrusiveSharingPtr 
-{
-public:
-    typedef T element_type;
-    
-    explicit 
-    IntrusiveSharingPtr () : 
-        ptr_(0) 
-    {
-    }
-    
-    explicit
-    IntrusiveSharingPtr (T* ptr) : 
-        ptr_(ptr) 
-    {
-        add_shared();
-    }
-    
-    IntrusiveSharingPtr (const IntrusiveSharingPtr& rhs) : 
-        ptr_(rhs.ptr_) 
-    {
-        add_shared();
-    }
-    
-    template <class X>
-    IntrusiveSharingPtr (const IntrusiveSharingPtr<X>& rhs)
-        : ptr_(rhs.get()) 
-    {
-        add_shared();
-    }
-    
-    IntrusiveSharingPtr& 
-    operator= (const IntrusiveSharingPtr& rhs) 
-    {
-        reset(rhs.get());
-        return *this;
-    }
-    
-    template <class X> IntrusiveSharingPtr& 
-    operator= (const IntrusiveSharingPtr<X>& rhs) 
-    {
-        reset(rhs.get());
-        return *this;
-    }
-    
-    IntrusiveSharingPtr& 
-    operator= (T *ptr) 
-    {
-        reset(ptr);
-        return *this;
-    }
-    
-    ~IntrusiveSharingPtr() 
-    {
-        release_shared(); 
-#if defined (LLDB_CONFIGURATION_DEBUG) || defined (LLDB_CONFIGURATION_RELEASE)
-        // NULL out the pointer in objects which can help with leaks detection.
-        // We don't enable this for LLDB_CONFIGURATION_BUILD_AND_INTEGRATION or
-        // when none of the LLDB_CONFIGURATION_XXX macros are defined since
-        // those would be builds for release. But for debug and release builds
-        // that are for development, we NULL out the pointers to catch potential
-        // issues.
-        ptr_ = NULL; 
-#endif  // #if defined (LLDB_CONFIGURATION_DEBUG) || defined (LLDB_CONFIGURATION_RELEASE)
-    }
-    
-    T& 
-    operator*() const 
-    {
-        return *ptr_; 
-    }
-    
-    T* 
-    operator->() const
-    {
-        return ptr_; 
-    }
-    
-    T* 
-    get() const
-    {
-        return ptr_; 
-    }
-    
-    explicit operator bool() const
-    {
-        return ptr_ != 0;
-    }
-    
-    void 
-    swap (IntrusiveSharingPtr& rhs) 
-    {
-        std::swap(ptr_, rhs.ptr_);
-#if defined (ENABLE_SP_LOGGING)
-        track_sp (this, ptr_, use_count());
-        track_sp (&rhs, rhs.ptr_, rhs.use_count());
-#endif
-    }
-
-    void 
-    reset(T* ptr = NULL) 
-    {
-        IntrusiveSharingPtr(ptr).swap(*this);
-    }
-
-    long
-    use_count () const
-    {
-        if (ptr_)
-            return ptr_->use_count();
-        return 0;
-    }
-    
-    bool
-    unique () const
-    {
-        return use_count () == 1;
-    }
-
-private:
-    element_type *ptr_;
-    
-    void
-    add_shared() 
-    {
-        if (ptr_) 
-        {
-            ptr_->add_shared(); 
-#if defined (ENABLE_SP_LOGGING)
-            track_sp (this, ptr_, ptr_->use_count());
-#endif
-        }
-    }
-    void
-    release_shared()
-    { 
-        if (ptr_) 
-        {
-#if defined (ENABLE_SP_LOGGING)
-            track_sp (this, NULL, ptr_->use_count() - 1);
-#endif
-            ptr_->release_shared(); 
-        }
-    }
-};
-
-template<class T, class U>
-inline bool operator== (const IntrusiveSharingPtr<T>& lhs, const IntrusiveSharingPtr<U>& rhs)
-{
-    return lhs.get() == rhs.get();
-}
-
-template<class T, class U>
-inline bool operator!= (const IntrusiveSharingPtr<T>& lhs, const IntrusiveSharingPtr<U>& rhs)
-{
-    return lhs.get() != rhs.get();
-}
-
-template<class T, class U>
-inline bool operator== (const IntrusiveSharingPtr<T>& lhs, U* rhs)
-{
-    return lhs.get() == rhs;
-}
-
-template<class T, class U>
-inline bool operator!= (const IntrusiveSharingPtr<T>& lhs, U* rhs)
-{
-    return lhs.get() != rhs;
-}
-
-template<class T, class U>
-inline bool operator== (T* lhs, const IntrusiveSharingPtr<U>& rhs)
-{
-    return lhs == rhs.get();
-}
-
-template<class T, class U>
-inline bool operator!= (T* lhs, const IntrusiveSharingPtr<U>& rhs)
-{
-    return lhs != rhs.get();
-}
-
-} // namespace lldb_private
-
-#endif  // utility_SharingPtr_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-defines.h b/kcov-38/external/lldb/include/lldb/lldb-defines.h
deleted file mode 100644
index 9dce69aef32b..000000000000
--- a/kcov-38/external/lldb/include/lldb/lldb-defines.h
+++ /dev/null
@@ -1,153 +0,0 @@
-//===-- lldb-defines.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_lldb_defines_h_
-#define LLDB_lldb_defines_h_
-
-#include "lldb/lldb-types.h"
-
-#if defined (_MSC_VER)
-    #if defined(EXPORT_LIBLLDB)
-        #define  LLDB_API __declspec(dllexport)
-    #elif defined(IMPORT_LIBLLDB)
-        #define  LLDB_API __declspec(dllimport)
-    #else
-        #define LLDB_API
-    #endif
-#else // defined (_MSC_VER)
-    #define LLDB_API
-#endif
-
-#if !defined(INT32_MAX)
-    #define INT32_MAX 2147483647
-#endif
-
-#if !defined(UINT32_MAX)
-    #define UINT32_MAX 4294967295U
-#endif
-
-#if !defined(UINT64_MAX)
-    #define UINT64_MAX 18446744073709551615ULL
-#endif
-
-//----------------------------------------------------------------------
-// LLDB version
-//
-// A build script phase can modify this version number if needed.
-//----------------------------------------------------------------------
-//#define LLDB_VERSION
-//#define LLDB_REVISION
-//#define LLDB_VERSION_STRING
-
-//----------------------------------------------------------------------
-// LLDB defines
-//----------------------------------------------------------------------
-#define LLDB_GENERIC_ERROR              UINT32_MAX
-
-//----------------------------------------------------------------------
-// Breakpoints
-//----------------------------------------------------------------------
-#define LLDB_INVALID_BREAK_ID           0
-#define LLDB_DEFAULT_BREAK_SIZE         0
-#define LLDB_BREAK_ID_IS_VALID(bid)     ((bid) != (LLDB_INVALID_BREAK_ID))
-#define LLDB_BREAK_ID_IS_INTERNAL(bid)  ((bid) < 0)
-
-//----------------------------------------------------------------------
-// Watchpoints
-//----------------------------------------------------------------------
-#define LLDB_INVALID_WATCH_ID           0
-#define LLDB_WATCH_ID_IS_VALID(uid)     ((uid) != (LLDB_INVALID_WATCH_ID))
-#define LLDB_WATCH_TYPE_READ            (1u << 0)
-#define LLDB_WATCH_TYPE_WRITE           (1u << 1)
-#define LLDB_WATCH_TYPE_IS_VALID(type)  ((type | LLDB_WATCH_TYPE_READ) || (type | LLDB_WATCH_TYPE_WRITE))
-
-//----------------------------------------------------------------------
-// Generic Register Numbers
-//----------------------------------------------------------------------
-#define LLDB_REGNUM_GENERIC_PC          0   // Program Counter
-#define LLDB_REGNUM_GENERIC_SP          1   // Stack Pointer
-#define LLDB_REGNUM_GENERIC_FP          2   // Frame Pointer
-#define LLDB_REGNUM_GENERIC_RA          3   // Return Address
-#define LLDB_REGNUM_GENERIC_FLAGS       4   // Processor flags register
-#define LLDB_REGNUM_GENERIC_ARG1        5   // The register that would contain pointer size or less argument 1 (if any)
-#define LLDB_REGNUM_GENERIC_ARG2        6   // The register that would contain pointer size or less argument 2 (if any)
-#define LLDB_REGNUM_GENERIC_ARG3        7   // The register that would contain pointer size or less argument 3 (if any)
-#define LLDB_REGNUM_GENERIC_ARG4        8   // The register that would contain pointer size or less argument 4 (if any)
-#define LLDB_REGNUM_GENERIC_ARG5        9   // The register that would contain pointer size or less argument 5 (if any)
-#define LLDB_REGNUM_GENERIC_ARG6        10  // The register that would contain pointer size or less argument 6 (if any)
-#define LLDB_REGNUM_GENERIC_ARG7        11  // The register that would contain pointer size or less argument 7 (if any)
-#define LLDB_REGNUM_GENERIC_ARG8        12  // The register that would contain pointer size or less argument 8 (if any)
-//---------------------------------------------------------------------
-/// Invalid value definitions
-//----------------------------------------------------------------------
-#define LLDB_INVALID_ADDRESS            UINT64_MAX
-#define LLDB_INVALID_INDEX32            UINT32_MAX
-#define LLDB_INVALID_IVAR_OFFSET        UINT32_MAX
-#define LLDB_INVALID_IMAGE_TOKEN        UINT32_MAX
-#define LLDB_INVALID_MODULE_VERSION     UINT32_MAX
-#define LLDB_INVALID_REGNUM             UINT32_MAX
-#define LLDB_INVALID_UID                UINT64_MAX
-#define LLDB_INVALID_PROCESS_ID         0
-#define LLDB_INVALID_THREAD_ID          0
-#define LLDB_INVALID_FRAME_ID           UINT32_MAX
-#define LLDB_INVALID_SIGNAL_NUMBER      INT32_MAX
-#define LLDB_INVALID_OFFSET             UINT64_MAX // Must match max of lldb::offset_t
-#define LLDB_INVALID_LINE_NUMBER        UINT32_MAX
-#define LLDB_INVALID_QUEUE_ID           0
-
-//----------------------------------------------------------------------
-/// CPU Type definitions
-//----------------------------------------------------------------------
-#define LLDB_ARCH_DEFAULT               "systemArch"
-#define LLDB_ARCH_DEFAULT_32BIT         "systemArch32"
-#define LLDB_ARCH_DEFAULT_64BIT         "systemArch64"
-#define LLDB_INVALID_CPUTYPE            (0xFFFFFFFEu)
-
-//----------------------------------------------------------------------
-/// Option Set definitions
-//----------------------------------------------------------------------
-// FIXME: I'm sure there's some #define magic that can create all 32 sets on the
-// fly.  That would have the added benefit of making this unreadable.
-#define LLDB_MAX_NUM_OPTION_SETS        32
-#define LLDB_OPT_SET_ALL                0xFFFFFFFFU
-#define LLDB_OPT_SET_1                  (1U << 0)
-#define LLDB_OPT_SET_2                  (1U << 1)
-#define LLDB_OPT_SET_3                  (1U << 2)
-#define LLDB_OPT_SET_4                  (1U << 3)
-#define LLDB_OPT_SET_5                  (1U << 4)
-#define LLDB_OPT_SET_6                  (1U << 5)
-#define LLDB_OPT_SET_7                  (1U << 6)
-#define LLDB_OPT_SET_8                  (1U << 7)
-#define LLDB_OPT_SET_9                  (1U << 8)
-#define LLDB_OPT_SET_10                 (1U << 9)
-#define LLDB_OPT_SET_FROM_TO(A, B)      (((1U << (B)) - 1) ^ (((1U << (A))-1) >> 1))
-
-#if defined (_WIN32) && !defined (MAX_PATH)
-#define MAX_PATH 260
-#endif
-
-#ifdef _MSC_VER
-// ignore GCC function attributes
-#define __attribute__(X)
-#endif
-
-#if defined(__cplusplus)
-
-//----------------------------------------------------------------------
-/// @def DISALLOW_COPY_AND_ASSIGN(TypeName)
-///     Macro definition for easily disallowing copy constructor and
-///     assignment operators in C++ classes.
-//----------------------------------------------------------------------
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-    TypeName(const TypeName&); \
-    const TypeName& operator=(const TypeName&)
-
-#endif // #if defined(__cplusplus)
-
-#endif  // LLDB_lldb_defines_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-enumerations.h b/kcov-38/external/lldb/include/lldb/lldb-enumerations.h
deleted file mode 100644
index ea8910525866..000000000000
--- a/kcov-38/external/lldb/include/lldb/lldb-enumerations.h
+++ /dev/null
@@ -1,1052 +0,0 @@
-//===-- lldb-enumerations.h -------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_lldb_enumerations_h_
-#define LLDB_lldb_enumerations_h_
-
-#ifndef SWIG
-// With MSVC, the default type of an enum is always signed, even if one of the
-// enumerator values is too large to fit into a signed integer but would
-// otherwise fit into an unsigned integer.  As a result of this, all of LLDB's
-// flag-style enumerations that specify something like eValueFoo = 1u << 31
-// result in negative values.  This usually just results in a benign warning,
-// but in a few places we actually do comparisons on the enum values, which
-// would cause a real bug.  Furthermore, there's no way to silence only this
-// warning, as it's part of -Wmicrosoft which also catches a whole slew of
-// other useful issues.
-//
-// To make matters worse, early versions of SWIG don't recognize the syntax
-// of specifying the underlying type of an enum (and Python doesn't care anyway)
-// so we need a way to specify the underlying type when the enum is being used
-// from C++ code, but just use a regular enum when swig is pre-processing.
-#define FLAGS_ENUM(Name) enum Name : unsigned
-#define FLAGS_ANONYMOUS_ENUM() enum : unsigned
-#else
-#define FLAGS_ENUM(Name) enum Name
-#define FLAGS_ANONYMOUS_ENUM() enum
-#endif
-
-namespace lldb {
-
-    //----------------------------------------------------------------------
-    // Process and Thread States
-    //----------------------------------------------------------------------
-    enum StateType
-    {
-        eStateInvalid = 0,
-        eStateUnloaded,     ///< Process is object is valid, but not currently loaded
-        eStateConnected,    ///< Process is connected to remote debug services, but not launched or attached to anything yet
-        eStateAttaching,    ///< Process is currently trying to attach
-        eStateLaunching,    ///< Process is in the process of launching
-        eStateStopped,      ///< Process or thread is stopped and can be examined.
-        eStateRunning,      ///< Process or thread is running and can't be examined.
-        eStateStepping,     ///< Process or thread is in the process of stepping and can not be examined.
-        eStateCrashed,      ///< Process or thread has crashed and can be examined.
-        eStateDetached,     ///< Process has been detached and can't be examined.
-        eStateExited,       ///< Process has exited and can't be examined.
-        eStateSuspended     ///< Process or thread is in a suspended state as far
-                            ///< as the debugger is concerned while other processes
-                            ///< or threads get the chance to run.
-    };
-
-    //----------------------------------------------------------------------
-    // Launch Flags
-    //----------------------------------------------------------------------
-    FLAGS_ENUM(LaunchFlags)
-    {
-        eLaunchFlagNone         = 0u,
-        eLaunchFlagExec         = (1u << 0),       ///< Exec when launching and turn the calling process into a new process
-        eLaunchFlagDebug        = (1u << 1),       ///< Stop as soon as the process launches to allow the process to be debugged
-        eLaunchFlagStopAtEntry  = (1u << 2),       ///< Stop at the program entry point instead of auto-continuing when launching or attaching at entry point
-        eLaunchFlagDisableASLR  = (1u << 3),       ///< Disable Address Space Layout Randomization
-        eLaunchFlagDisableSTDIO = (1u << 4),       ///< Disable stdio for inferior process (e.g. for a GUI app)
-        eLaunchFlagLaunchInTTY  = (1u << 5),       ///< Launch the process in a new TTY if supported by the host
-        eLaunchFlagLaunchInShell= (1u << 6),       ///< Launch the process inside a shell to get shell expansion
-        eLaunchFlagLaunchInSeparateProcessGroup = (1u << 7), ///< Launch the process in a separate process group
-        eLaunchFlagDontSetExitStatus = (1u << 8), ///< If you are going to hand the process off (e.g. to debugserver)
-                                                   ///< set this flag so lldb & the handee don't race to set its exit status.
-        eLaunchFlagDetachOnError = (1u << 9),     ///< If set, then the client stub should detach rather than killing the debugee
-                                                   ///< if it loses connection with lldb.
-        eLaunchFlagShellExpandArguments  = (1u << 10),       ///< Perform shell-style argument expansion
-        eLaunchFlagCloseTTYOnExit = (1u << 11),    ///< Close the open TTY on exit
-    };
-        
-    //----------------------------------------------------------------------
-    // Thread Run Modes
-    //----------------------------------------------------------------------
-    enum RunMode
-    {
-        eOnlyThisThread,
-        eAllThreads,
-        eOnlyDuringStepping
-    };
-
-    //----------------------------------------------------------------------
-    // Byte ordering definitions
-    //----------------------------------------------------------------------
-    enum ByteOrder
-    {
-        eByteOrderInvalid   = 0,
-        eByteOrderBig       = 1,
-        eByteOrderPDP       = 2,
-        eByteOrderLittle    = 4
-    };
-
-    //----------------------------------------------------------------------
-    // Register encoding definitions
-    //----------------------------------------------------------------------
-    enum Encoding
-    {
-        eEncodingInvalid = 0,
-        eEncodingUint,               // unsigned integer
-        eEncodingSint,               // signed integer
-        eEncodingIEEE754,            // float
-        eEncodingVector              // vector registers
-    };
-
-    //----------------------------------------------------------------------
-    // Display format definitions
-    //----------------------------------------------------------------------
-    enum Format
-    {
-        eFormatDefault = 0,
-        eFormatInvalid = 0,
-        eFormatBoolean,
-        eFormatBinary,
-        eFormatBytes,
-        eFormatBytesWithASCII,
-        eFormatChar,
-        eFormatCharPrintable,   // Only printable characters, space if not printable
-        eFormatComplex,         // Floating point complex type
-        eFormatComplexFloat = eFormatComplex,
-        eFormatCString,         // NULL terminated C strings
-        eFormatDecimal,
-        eFormatEnum,
-        eFormatHex,
-        eFormatHexUppercase,
-        eFormatFloat,
-        eFormatOctal,
-        eFormatOSType,          // OS character codes encoded into an integer 'PICT' 'text' etc...
-        eFormatUnicode16,
-        eFormatUnicode32,
-        eFormatUnsigned,
-        eFormatPointer,
-        eFormatVectorOfChar,
-        eFormatVectorOfSInt8,
-        eFormatVectorOfUInt8,
-        eFormatVectorOfSInt16,
-        eFormatVectorOfUInt16,
-        eFormatVectorOfSInt32,
-        eFormatVectorOfUInt32,
-        eFormatVectorOfSInt64,
-        eFormatVectorOfUInt64,
-        eFormatVectorOfFloat32,
-        eFormatVectorOfFloat64,
-        eFormatVectorOfUInt128,
-        eFormatComplexInteger,      // Integer complex type
-        eFormatCharArray,           // Print characters with no single quotes, used for character arrays that can contain non printable characters
-        eFormatAddressInfo,         // Describe what an address points to (func + offset with file/line, symbol + offset, data, etc)
-        eFormatHexFloat,            // ISO C99 hex float string
-        eFormatInstruction,         // Disassemble an opcode
-        eFormatVoid,                // Do not print this
-        kNumFormats
-    };
-
-    //----------------------------------------------------------------------
-    // Description levels for "void GetDescription(Stream *, DescriptionLevel)" calls
-    //----------------------------------------------------------------------
-    enum DescriptionLevel
-    {
-        eDescriptionLevelBrief = 0,
-        eDescriptionLevelFull,
-        eDescriptionLevelVerbose,
-        eDescriptionLevelInitial,
-        kNumDescriptionLevels
-    };
-
-    //----------------------------------------------------------------------
-    // Script interpreter types
-    //----------------------------------------------------------------------
-    enum ScriptLanguage
-    {
-        eScriptLanguageNone,
-        eScriptLanguagePython,
-        eScriptLanguageDefault = eScriptLanguagePython
-    };
-
-    //----------------------------------------------------------------------
-    // Register numbering types
-    // See RegisterContext::ConvertRegisterKindToRegisterNumber to convert
-    // any of these to the lldb internal register numbering scheme 
-    // (eRegisterKindLLDB).
-    //----------------------------------------------------------------------
-    enum RegisterKind
-    {
-        eRegisterKindGCC = 0,    // the register numbers seen in eh_frame
-        eRegisterKindDWARF,      // the register numbers seen DWARF
-        eRegisterKindGeneric,    // insn ptr reg, stack ptr reg, etc not specific to any particular target
-        eRegisterKindGDB,        // the register numbers gdb uses (matches stabs numbers)
-        eRegisterKindLLDB,       // lldb's internal register numbers
-        kNumRegisterKinds
-    };
-
-    //----------------------------------------------------------------------
-    // Thread stop reasons
-    //----------------------------------------------------------------------
-    enum StopReason
-    {
-        eStopReasonInvalid = 0,
-        eStopReasonNone,
-        eStopReasonTrace,
-        eStopReasonBreakpoint,
-        eStopReasonWatchpoint,
-        eStopReasonSignal,
-        eStopReasonException,
-        eStopReasonExec,        // Program was re-exec'ed
-        eStopReasonPlanComplete,
-        eStopReasonThreadExiting,
-        eStopReasonInstrumentation
-    };
-
-    //----------------------------------------------------------------------
-    // Command Return Status Types
-    //----------------------------------------------------------------------
-    enum ReturnStatus
-    {
-        eReturnStatusInvalid,
-        eReturnStatusSuccessFinishNoResult,
-        eReturnStatusSuccessFinishResult,
-        eReturnStatusSuccessContinuingNoResult,
-        eReturnStatusSuccessContinuingResult,
-        eReturnStatusStarted,
-        eReturnStatusFailed,
-        eReturnStatusQuit
-    };
-
-
-    //----------------------------------------------------------------------
-    // The results of expression evaluation:
-    //----------------------------------------------------------------------
-    enum ExpressionResults
-    {
-        eExpressionCompleted = 0,
-        eExpressionSetupError,
-        eExpressionParseError,
-        eExpressionDiscarded,
-        eExpressionInterrupted,
-        eExpressionHitBreakpoint,
-        eExpressionTimedOut,
-        eExpressionResultUnavailable,
-        eExpressionStoppedForDebug
-    };
-
-    //----------------------------------------------------------------------
-    // Connection Status Types
-    //----------------------------------------------------------------------
-    enum ConnectionStatus
-    {
-        eConnectionStatusSuccess,         // Success
-        eConnectionStatusEndOfFile,       // End-of-file encountered
-        eConnectionStatusError,           // Check GetError() for details
-        eConnectionStatusTimedOut,        // Request timed out
-        eConnectionStatusNoConnection,    // No connection
-        eConnectionStatusLostConnection,  // Lost connection while connected to a valid connection
-        eConnectionStatusInterrupted      // Interrupted read
-    };
-
-    enum ErrorType
-    {
-        eErrorTypeInvalid,
-        eErrorTypeGeneric,      ///< Generic errors that can be any value.
-        eErrorTypeMachKernel,   ///< Mach kernel error codes.
-        eErrorTypePOSIX,        ///< POSIX error codes.
-        eErrorTypeExpression,   ///< These are from the ExpressionResults enum.
-        eErrorTypeWin32         ///< Standard Win32 error codes.
-    };
-
-
-    enum ValueType
-    {
-        eValueTypeInvalid           = 0,
-        eValueTypeVariableGlobal    = 1,    // globals variable
-        eValueTypeVariableStatic    = 2,    // static variable
-        eValueTypeVariableArgument  = 3,    // function argument variables
-        eValueTypeVariableLocal     = 4,    // function local variables
-        eValueTypeRegister          = 5,    // stack frame register value
-        eValueTypeRegisterSet       = 6,    // A collection of stack frame register values
-        eValueTypeConstResult       = 7     // constant result variables
-    };
-
-    //----------------------------------------------------------------------
-    // Token size/granularities for Input Readers
-    //----------------------------------------------------------------------
-
-    enum InputReaderGranularity
-    {
-        eInputReaderGranularityInvalid = 0,
-        eInputReaderGranularityByte,
-        eInputReaderGranularityWord,
-        eInputReaderGranularityLine,
-        eInputReaderGranularityAll
-    };
-
-    //------------------------------------------------------------------
-    /// These mask bits allow a common interface for queries that can
-    /// limit the amount of information that gets parsed to only the
-    /// information that is requested. These bits also can indicate what
-    /// actually did get resolved during query function calls.
-    ///
-    /// Each definition corresponds to a one of the member variables
-    /// in this class, and requests that that item be resolved, or
-    /// indicates that the member did get resolved.
-    //------------------------------------------------------------------
-    FLAGS_ENUM(SymbolContextItem)
-    {
-        eSymbolContextTarget     = (1u << 0), ///< Set when \a target is requested from a query, or was located in query results
-        eSymbolContextModule     = (1u << 1), ///< Set when \a module is requested from a query, or was located in query results
-        eSymbolContextCompUnit   = (1u << 2), ///< Set when \a comp_unit is requested from a query, or was located in query results
-        eSymbolContextFunction   = (1u << 3), ///< Set when \a function is requested from a query, or was located in query results
-        eSymbolContextBlock      = (1u << 4), ///< Set when the deepest \a block is requested from a query, or was located in query results
-        eSymbolContextLineEntry  = (1u << 5), ///< Set when \a line_entry is requested from a query, or was located in query results
-        eSymbolContextSymbol     = (1u << 6), ///< Set when \a symbol is requested from a query, or was located in query results
-        eSymbolContextEverything = ((eSymbolContextSymbol << 1) - 1u),  ///< Indicates to try and lookup everything up during a routine symbol context query.
-        eSymbolContextVariable   = (1u << 7)  ///< Set when \a global or static variable is requested from a query, or was located in query results.
-                                              ///< eSymbolContextVariable is potentially expensive to lookup so it isn't included in
-                                              ///< eSymbolContextEverything which stops it from being used during frame PC lookups and
-                                              ///< many other potential address to symbol context lookups.
-    };
-
-    FLAGS_ENUM(Permissions)
-    {
-        ePermissionsWritable    = (1u << 0),
-        ePermissionsReadable    = (1u << 1),
-        ePermissionsExecutable  = (1u << 2)
-    };
-
-    enum InputReaderAction
-    {
-        eInputReaderActivate,   // reader is newly pushed onto the reader stack 
-        eInputReaderAsynchronousOutputWritten, // an async output event occurred; the reader may want to do something
-        eInputReaderReactivate, // reader is on top of the stack again after another reader was popped off 
-        eInputReaderDeactivate, // another reader was pushed on the stack 
-        eInputReaderGotToken,   // reader got one of its tokens (granularity)
-        eInputReaderInterrupt,  // reader received an interrupt signal (probably from a control-c)
-        eInputReaderEndOfFile,  // reader received an EOF char (probably from a control-d)
-        eInputReaderDone        // reader was just popped off the stack and is done
-    };
-
-    FLAGS_ENUM(BreakpointEventType)
-    {
-        eBreakpointEventTypeInvalidType         = (1u << 0),
-        eBreakpointEventTypeAdded               = (1u << 1),
-        eBreakpointEventTypeRemoved             = (1u << 2),
-        eBreakpointEventTypeLocationsAdded      = (1u << 3),  // Locations added doesn't get sent when the breakpoint is created
-        eBreakpointEventTypeLocationsRemoved    = (1u << 4),
-        eBreakpointEventTypeLocationsResolved   = (1u << 5),
-        eBreakpointEventTypeEnabled             = (1u << 6),
-        eBreakpointEventTypeDisabled            = (1u << 7),
-        eBreakpointEventTypeCommandChanged      = (1u << 8),
-        eBreakpointEventTypeConditionChanged    = (1u << 9),
-        eBreakpointEventTypeIgnoreChanged       = (1u << 10),
-        eBreakpointEventTypeThreadChanged       = (1u << 11)
-    };
-
-    FLAGS_ENUM(WatchpointEventType)
-    {
-        eWatchpointEventTypeInvalidType         = (1u << 0),
-        eWatchpointEventTypeAdded               = (1u << 1),
-        eWatchpointEventTypeRemoved             = (1u << 2),
-        eWatchpointEventTypeEnabled             = (1u << 6),
-        eWatchpointEventTypeDisabled            = (1u << 7),
-        eWatchpointEventTypeCommandChanged      = (1u << 8),
-        eWatchpointEventTypeConditionChanged    = (1u << 9),
-        eWatchpointEventTypeIgnoreChanged       = (1u << 10),
-        eWatchpointEventTypeThreadChanged       = (1u << 11),
-        eWatchpointEventTypeTypeChanged         = (1u << 12)
-    };
-
-
-    //----------------------------------------------------------------------
-    /// Programming language type.
-    ///
-    /// These enumerations use the same language enumerations as the DWARF
-    /// specification for ease of use and consistency.
-    /// The enum -> string code is in LanguageRuntime.cpp, don't change this
-    /// table without updating that code as well.
-    //----------------------------------------------------------------------
-    enum LanguageType
-    {
-        eLanguageTypeUnknown         = 0x0000,   ///< Unknown or invalid language value.
-        eLanguageTypeC89             = 0x0001,   ///< ISO C:1989.
-        eLanguageTypeC               = 0x0002,   ///< Non-standardized C, such as K&R.
-        eLanguageTypeAda83           = 0x0003,   ///< ISO Ada:1983.
-        eLanguageTypeC_plus_plus     = 0x0004,   ///< ISO C++:1998.
-        eLanguageTypeCobol74         = 0x0005,   ///< ISO Cobol:1974.
-        eLanguageTypeCobol85         = 0x0006,   ///< ISO Cobol:1985.
-        eLanguageTypeFortran77       = 0x0007,   ///< ISO Fortran 77.
-        eLanguageTypeFortran90       = 0x0008,   ///< ISO Fortran 90.
-        eLanguageTypePascal83        = 0x0009,   ///< ISO Pascal:1983.
-        eLanguageTypeModula2         = 0x000a,   ///< ISO Modula-2:1996.
-        eLanguageTypeJava            = 0x000b,   ///< Java.
-        eLanguageTypeC99             = 0x000c,   ///< ISO C:1999.
-        eLanguageTypeAda95           = 0x000d,   ///< ISO Ada:1995.
-        eLanguageTypeFortran95       = 0x000e,   ///< ISO Fortran 95.
-        eLanguageTypePLI             = 0x000f,   ///< ANSI PL/I:1976.
-        eLanguageTypeObjC            = 0x0010,   ///< Objective-C.
-        eLanguageTypeObjC_plus_plus  = 0x0011,   ///< Objective-C++.
-        eLanguageTypeUPC             = 0x0012,   ///< Unified Parallel C.
-        eLanguageTypeD               = 0x0013,   ///< D.
-        eLanguageTypePython          = 0x0014,   ///< Python.
-        // NOTE: The below are DWARF5 constants, subject to change upon
-        // completion of the DWARF5 specification
-        eLanguageTypeOpenCL          = 0x0015,   ///< OpenCL.
-        eLanguageTypeGo              = 0x0016,   ///< Go.
-        eLanguageTypeModula3         = 0x0017,   ///< Modula 3.
-        eLanguageTypeHaskell         = 0x0018,   ///< Haskell.
-        eLanguageTypeC_plus_plus_03  = 0x0019,   ///< ISO C++:2003.
-        eLanguageTypeC_plus_plus_11  = 0x001a,   ///< ISO C++:2011.
-        eLanguageTypeOCaml           = 0x001b,   ///< OCaml.
-        eLanguageTypeRust            = 0x001c,   ///< Rust.
-        eLanguageTypeC11             = 0x001d,   ///< ISO C:2011.
-        eLanguageTypeSwift           = 0x001e,   ///< Swift.
-        eLanguageTypeJulia           = 0x001f,   ///< Julia.
-        eLanguageTypeDylan           = 0x0020,   ///< Dylan.
-        eLanguageTypeC_plus_plus_14  = 0x0021,   ///< ISO C++:2014.
-        eLanguageTypeFortran03       = 0x0022,   ///< ISO Fortran 2003.
-        eLanguageTypeFortran08       = 0x0023,   ///< ISO Fortran 2008.
-        // Vendor Extensions
-        // Note: LanguageRuntime::GetNameForLanguageType
-        // assumes these can be used as indexes into array language_names, and
-        // Language::SetLanguageFromCString and Language::AsCString
-        // assume these can be used as indexes into array g_languages.
-        eLanguageTypeMipsAssembler   = 0x0024,   ///< Mips_Assembler.
-        eLanguageTypeExtRenderScript = 0x0025,   ///< RenderScript.
-        eNumLanguageTypes
-    };
-    
-    enum InstrumentationRuntimeType
-    {
-        eInstrumentationRuntimeTypeAddressSanitizer = 0x0000,
-        eNumInstrumentationRuntimeTypes
-    };
-
-    enum DynamicValueType
-    {
-        eNoDynamicValues = 0,
-        eDynamicCanRunTarget    = 1,
-        eDynamicDontRunTarget   = 2
-    };
-    
-    enum AccessType
-    {
-        eAccessNone,
-        eAccessPublic,
-        eAccessPrivate,
-        eAccessProtected,
-        eAccessPackage
-    };
-
-   enum CommandArgumentType
-    {
-        eArgTypeAddress = 0,
-        eArgTypeAddressOrExpression,
-        eArgTypeAliasName,
-        eArgTypeAliasOptions,
-        eArgTypeArchitecture,
-        eArgTypeBoolean,
-        eArgTypeBreakpointID,
-        eArgTypeBreakpointIDRange,
-        eArgTypeBreakpointName,
-        eArgTypeByteSize,
-        eArgTypeClassName,
-        eArgTypeCommandName,
-        eArgTypeCount,
-        eArgTypeDescriptionVerbosity,
-        eArgTypeDirectoryName,
-        eArgTypeDisassemblyFlavor,
-        eArgTypeEndAddress,
-        eArgTypeExpression,
-        eArgTypeExpressionPath,
-        eArgTypeExprFormat,
-        eArgTypeFilename,
-        eArgTypeFormat,
-        eArgTypeFrameIndex,
-        eArgTypeFullName,
-        eArgTypeFunctionName,
-        eArgTypeFunctionOrSymbol,
-        eArgTypeGDBFormat,
-        eArgTypeHelpText,
-        eArgTypeIndex,
-        eArgTypeLanguage,
-        eArgTypeLineNum,
-        eArgTypeLogCategory,
-        eArgTypeLogChannel,
-        eArgTypeMethod,
-        eArgTypeName,
-        eArgTypeNewPathPrefix,
-        eArgTypeNumLines,
-        eArgTypeNumberPerLine,
-        eArgTypeOffset,
-        eArgTypeOldPathPrefix,
-        eArgTypeOneLiner,
-        eArgTypePath,
-        eArgTypePermissionsNumber,
-        eArgTypePermissionsString,
-        eArgTypePid,
-        eArgTypePlugin,
-        eArgTypeProcessName,
-        eArgTypePythonClass,
-        eArgTypePythonFunction,
-        eArgTypePythonScript,
-        eArgTypeQueueName,
-        eArgTypeRegisterName,
-        eArgTypeRegularExpression,
-        eArgTypeRunArgs,
-        eArgTypeRunMode,
-        eArgTypeScriptedCommandSynchronicity,
-        eArgTypeScriptLang,
-        eArgTypeSearchWord,
-        eArgTypeSelector,
-        eArgTypeSettingIndex,
-        eArgTypeSettingKey,
-        eArgTypeSettingPrefix,
-        eArgTypeSettingVariableName,
-        eArgTypeShlibName,
-        eArgTypeSourceFile,
-        eArgTypeSortOrder,
-        eArgTypeStartAddress,
-        eArgTypeSummaryString,
-        eArgTypeSymbol,
-        eArgTypeThreadID,
-        eArgTypeThreadIndex,
-        eArgTypeThreadName,
-        eArgTypeTypeName,
-        eArgTypeUnsignedInteger,
-        eArgTypeUnixSignal,
-        eArgTypeVarName,
-        eArgTypeValue,
-        eArgTypeWidth,
-        eArgTypeNone,
-        eArgTypePlatform,
-        eArgTypeWatchpointID,
-        eArgTypeWatchpointIDRange,
-        eArgTypeWatchType,
-        eArgTypeLastArg  // Always keep this entry as the last entry in this enumeration!!
-    };
-
-    //----------------------------------------------------------------------
-    // Symbol types
-    //----------------------------------------------------------------------
-    enum SymbolType
-    {
-        eSymbolTypeAny = 0,
-        eSymbolTypeInvalid = 0,
-        eSymbolTypeAbsolute,
-        eSymbolTypeCode,
-        eSymbolTypeResolver,
-        eSymbolTypeData,
-        eSymbolTypeTrampoline,
-        eSymbolTypeRuntime,
-        eSymbolTypeException,
-        eSymbolTypeSourceFile,
-        eSymbolTypeHeaderFile,
-        eSymbolTypeObjectFile,
-        eSymbolTypeCommonBlock,
-        eSymbolTypeBlock,
-        eSymbolTypeLocal,
-        eSymbolTypeParam,
-        eSymbolTypeVariable,
-        eSymbolTypeVariableType,
-        eSymbolTypeLineEntry,
-        eSymbolTypeLineHeader,
-        eSymbolTypeScopeBegin,
-        eSymbolTypeScopeEnd,
-        eSymbolTypeAdditional, // When symbols take more than one entry, the extra entries get this type
-        eSymbolTypeCompiler,
-        eSymbolTypeInstrumentation,
-        eSymbolTypeUndefined,
-        eSymbolTypeObjCClass,
-        eSymbolTypeObjCMetaClass,
-        eSymbolTypeObjCIVar,
-        eSymbolTypeReExported
-    };
-    
-    enum SectionType
-    {
-        eSectionTypeInvalid,
-        eSectionTypeCode,
-        eSectionTypeContainer,              // The section contains child sections
-        eSectionTypeData,
-        eSectionTypeDataCString,            // Inlined C string data
-        eSectionTypeDataCStringPointers,    // Pointers to C string data
-        eSectionTypeDataSymbolAddress,      // Address of a symbol in the symbol table
-        eSectionTypeData4,
-        eSectionTypeData8,
-        eSectionTypeData16,
-        eSectionTypeDataPointers,
-        eSectionTypeDebug,
-        eSectionTypeZeroFill,
-        eSectionTypeDataObjCMessageRefs,    // Pointer to function pointer + selector
-        eSectionTypeDataObjCCFStrings,      // Objective C const CFString/NSString objects
-        eSectionTypeDWARFDebugAbbrev,
-        eSectionTypeDWARFDebugAranges,
-        eSectionTypeDWARFDebugFrame,
-        eSectionTypeDWARFDebugInfo,
-        eSectionTypeDWARFDebugLine,
-        eSectionTypeDWARFDebugLoc,
-        eSectionTypeDWARFDebugMacInfo,
-        eSectionTypeDWARFDebugPubNames,
-        eSectionTypeDWARFDebugPubTypes,
-        eSectionTypeDWARFDebugRanges,
-        eSectionTypeDWARFDebugStr,
-        eSectionTypeDWARFAppleNames,
-        eSectionTypeDWARFAppleTypes,
-        eSectionTypeDWARFAppleNamespaces,
-        eSectionTypeDWARFAppleObjC,
-        eSectionTypeELFSymbolTable,       // Elf SHT_SYMTAB section
-        eSectionTypeELFDynamicSymbols,    // Elf SHT_DYNSYM section
-        eSectionTypeELFRelocationEntries, // Elf SHT_REL or SHT_REL section
-        eSectionTypeELFDynamicLinkInfo,   // Elf SHT_DYNAMIC section
-        eSectionTypeEHFrame,
-        eSectionTypeCompactUnwind,        // compact unwind section in Mach-O, __TEXT,__unwind_info
-        eSectionTypeOther
-    };
-
-    FLAGS_ENUM(EmulateInstructionOptions)
-    {
-        eEmulateInstructionOptionNone               = (0u),
-        eEmulateInstructionOptionAutoAdvancePC      = (1u << 0),
-        eEmulateInstructionOptionIgnoreConditions   = (1u << 1)
-    };
-
-    FLAGS_ENUM(FunctionNameType)
-    {
-        eFunctionNameTypeNone       = 0u,
-        eFunctionNameTypeAuto       = (1u << 1),    // Automatically figure out which FunctionNameType
-                                                    // bits to set based on the function name.
-        eFunctionNameTypeFull       = (1u << 2),    // The function name.
-                                                    // For C this is the same as just the name of the function
-                                                    // For C++ this is the mangled or demangled version of the mangled name.
-                                                    // For ObjC this is the full function signature with the + or
-                                                    // - and the square brackets and the class and selector
-        eFunctionNameTypeBase       = (1u << 3),    // The function name only, no namespaces or arguments and no class 
-                                                    // methods or selectors will be searched.
-        eFunctionNameTypeMethod     = (1u << 4),    // Find function by method name (C++) with no namespace or arguments
-        eFunctionNameTypeSelector   = (1u << 5),    // Find function by selector name (ObjC) names
-        eFunctionNameTypeAny        = eFunctionNameTypeAuto // DEPRECATED: use eFunctionNameTypeAuto
-    };
-    
-    
-    //----------------------------------------------------------------------
-    // Basic types enumeration for the public API SBType::GetBasicType()
-    //----------------------------------------------------------------------
-    enum BasicType
-    {
-		eBasicTypeInvalid = 0,
-        eBasicTypeVoid = 1,
-        eBasicTypeChar,
-        eBasicTypeSignedChar,
-        eBasicTypeUnsignedChar,
-        eBasicTypeWChar,
-        eBasicTypeSignedWChar,
-        eBasicTypeUnsignedWChar,
-        eBasicTypeChar16,
-        eBasicTypeChar32,
-        eBasicTypeShort,
-        eBasicTypeUnsignedShort,
-        eBasicTypeInt,
-        eBasicTypeUnsignedInt,
-        eBasicTypeLong,
-        eBasicTypeUnsignedLong,
-        eBasicTypeLongLong,
-        eBasicTypeUnsignedLongLong,
-        eBasicTypeInt128,
-        eBasicTypeUnsignedInt128,
-        eBasicTypeBool,
-        eBasicTypeHalf,
-        eBasicTypeFloat,
-        eBasicTypeDouble,
-        eBasicTypeLongDouble,
-        eBasicTypeFloatComplex,
-        eBasicTypeDoubleComplex,
-        eBasicTypeLongDoubleComplex,
-        eBasicTypeObjCID,
-        eBasicTypeObjCClass,
-        eBasicTypeObjCSel,
-        eBasicTypeNullPtr,
-        eBasicTypeOther
-    };
-
-    FLAGS_ENUM(TypeClass)
-    {
-        eTypeClassInvalid           = (0u),
-        eTypeClassArray             = (1u << 0),
-        eTypeClassBlockPointer      = (1u << 1),
-        eTypeClassBuiltin           = (1u << 2),
-        eTypeClassClass             = (1u << 3),
-        eTypeClassComplexFloat      = (1u << 4),
-        eTypeClassComplexInteger    = (1u << 5),
-        eTypeClassEnumeration       = (1u << 6),
-        eTypeClassFunction          = (1u << 7),
-        eTypeClassMemberPointer     = (1u << 8),
-        eTypeClassObjCObject        = (1u << 9),
-        eTypeClassObjCInterface     = (1u << 10),
-        eTypeClassObjCObjectPointer = (1u << 11),
-        eTypeClassPointer           = (1u << 12),
-        eTypeClassReference         = (1u << 13),
-        eTypeClassStruct            = (1u << 14),
-        eTypeClassTypedef           = (1u << 15),
-        eTypeClassUnion             = (1u << 16),
-        eTypeClassVector            = (1u << 17),
-        // Define the last type class as the MSBit of a 32 bit value
-        eTypeClassOther             = (1u << 31),
-        // Define a mask that can be used for any type when finding types
-        eTypeClassAny               = (0xffffffffu)
-    };
-
-    enum TemplateArgumentKind
-    {
-        eTemplateArgumentKindNull = 0,
-        eTemplateArgumentKindType,
-        eTemplateArgumentKindDeclaration,
-        eTemplateArgumentKindIntegral,
-        eTemplateArgumentKindTemplate,
-        eTemplateArgumentKindTemplateExpansion,
-        eTemplateArgumentKindExpression,
-        eTemplateArgumentKindPack
-
-    };
-
-    //----------------------------------------------------------------------
-    // Options that can be set for a formatter to alter its behavior
-    // Not all of these are applicable to all formatter types
-    //----------------------------------------------------------------------
-    FLAGS_ENUM(TypeOptions)
-    {
-        eTypeOptionNone            = (0u),
-        eTypeOptionCascade         = (1u << 0),
-        eTypeOptionSkipPointers    = (1u << 1),
-        eTypeOptionSkipReferences  = (1u << 2),
-        eTypeOptionHideChildren    = (1u << 3),
-        eTypeOptionHideValue       = (1u << 4),
-        eTypeOptionShowOneLiner    = (1u << 5),
-        eTypeOptionHideNames       = (1u << 6)
-    };
-
-   //----------------------------------------------------------------------
-   // This is the return value for frame comparisons.  If you are comparing frame A to frame B
-   // the following cases arise:
-   // 1) When frame A pushes frame B (or a frame that ends up pushing B) A is Older than B.
-   // 2) When frame A pushed frame B (or if frame A is on the stack but B is not) A is Younger than B
-   // 3) When frame A and frame B have the same StackID, they are Equal.
-   // 4) When frame A and frame B have the same immediate parent frame, but are not equal, the comparision yields
-   //    SameParent.
-   // 5) If the two frames are on different threads or processes the comparision is Invalid
-   // 6) If for some reason we can't figure out what went on, we return Unknown.
-   //----------------------------------------------------------------------
-   enum FrameComparison
-   {
-       eFrameCompareInvalid,
-       eFrameCompareUnknown,
-       eFrameCompareEqual,
-       eFrameCompareSameParent,
-       eFrameCompareYounger,
-       eFrameCompareOlder
-   };
-   
-    //----------------------------------------------------------------------
-    // Address Class
-    //
-    // A way of classifying an address used for disassembling and setting 
-    // breakpoints. Many object files can track exactly what parts of their
-    // object files are code, data and other information. This is of course
-    // above and beyond just looking at the section types. For example, code
-    // might contain PC relative data and the object file might be able to
-    // tell us that an address in code is data.
-    //----------------------------------------------------------------------
-    enum AddressClass
-    {
-        eAddressClassInvalid,
-        eAddressClassUnknown,
-        eAddressClassCode,
-        eAddressClassCodeAlternateISA,
-        eAddressClassData,
-        eAddressClassDebug,
-        eAddressClassRuntime
-    };
-
-    //----------------------------------------------------------------------
-    // File Permissions
-    //
-    // Designed to mimic the unix file permission bits so they can be
-    // used with functions that set 'mode_t' to certain values for
-    // permissions.
-    //----------------------------------------------------------------------
-    FLAGS_ENUM(FilePermissions)
-    {
-        eFilePermissionsUserRead        = (1u << 8),
-        eFilePermissionsUserWrite       = (1u << 7),
-        eFilePermissionsUserExecute     = (1u << 6),
-        eFilePermissionsGroupRead       = (1u << 5),
-        eFilePermissionsGroupWrite      = (1u << 4),
-        eFilePermissionsGroupExecute    = (1u << 3),
-        eFilePermissionsWorldRead       = (1u << 2),
-        eFilePermissionsWorldWrite      = (1u << 1),
-        eFilePermissionsWorldExecute    = (1u << 0),
-        
-        eFilePermissionsUserRW      = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | 0                             ),
-        eFileFilePermissionsUserRX  = (eFilePermissionsUserRead    | 0                              | eFilePermissionsUserExecute   ),
-        eFilePermissionsUserRWX     = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | eFilePermissionsUserExecute   ),
-            
-        eFilePermissionsGroupRW     = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | 0                             ),
-        eFilePermissionsGroupRX     = (eFilePermissionsGroupRead   | 0                              | eFilePermissionsGroupExecute  ),
-        eFilePermissionsGroupRWX    = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | eFilePermissionsGroupExecute  ),
-        
-        eFilePermissionsWorldRW     = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | 0                             ),
-        eFilePermissionsWorldRX     = (eFilePermissionsWorldRead   | 0                              | eFilePermissionsWorldExecute  ),
-        eFilePermissionsWorldRWX    = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | eFilePermissionsWorldExecute  ),
-        
-        eFilePermissionsEveryoneR   = (eFilePermissionsUserRead    | eFilePermissionsGroupRead      | eFilePermissionsWorldRead     ),
-        eFilePermissionsEveryoneW   = (eFilePermissionsUserWrite   | eFilePermissionsGroupWrite     | eFilePermissionsWorldWrite    ),
-        eFilePermissionsEveryoneX   = (eFilePermissionsUserExecute | eFilePermissionsGroupExecute   | eFilePermissionsWorldExecute  ),
-        
-        eFilePermissionsEveryoneRW  = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | 0                             ),
-        eFilePermissionsEveryoneRX  = (eFilePermissionsEveryoneR   | 0                              | eFilePermissionsEveryoneX     ),
-        eFilePermissionsEveryoneRWX = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | eFilePermissionsEveryoneX     ),
-        eFilePermissionsFileDefault = eFilePermissionsUserRW,
-        eFilePermissionsDirectoryDefault = eFilePermissionsUserRWX,
-    };
-
-    //----------------------------------------------------------------------
-    // Queue work item types
-    //
-    // The different types of work that can be enqueued on a libdispatch
-    // aka Grand Central Dispatch (GCD) queue.
-    //----------------------------------------------------------------------
-    enum QueueItemKind
-    {
-        eQueueItemKindUnknown = 0,
-        eQueueItemKindFunction,
-        eQueueItemKindBlock
-    };
-
-    //----------------------------------------------------------------------
-    // Queue type
-    // libdispatch aka Grand Central Dispatch (GCD) queues can be either serial
-    // (executing on one thread) or concurrent (executing on multiple threads).
-    //----------------------------------------------------------------------
-    enum QueueKind
-    {
-        eQueueKindUnknown = 0,
-        eQueueKindSerial,
-        eQueueKindConcurrent
-    };
-    
-    //----------------------------------------------------------------------
-    // Expression Evaluation Stages
-    // These are the cancellable stages of expression evaluation, passed to the
-    // expression evaluation callback, so that you can interrupt expression
-    // evaluation at the various points in its lifecycle.
-    //----------------------------------------------------------------------
-    enum ExpressionEvaluationPhase
-    {
-        eExpressionEvaluationParse = 0,
-        eExpressionEvaluationIRGen,
-        eExpressionEvaluationExecution,
-        eExpressionEvaluationComplete
-    };
-    
-
-    //----------------------------------------------------------------------
-    // Watchpoint Kind
-    // Indicates what types of events cause the watchpoint to fire.
-    // Used by Native*Protocol-related classes.
-    //----------------------------------------------------------------------
-    FLAGS_ENUM(WatchpointKind)
-    {
-        eWatchpointKindRead = (1u << 0),
-        eWatchpointKindWrite = (1u << 1)
-    };
-
-    enum GdbSignal
-    {
-        eGdbSignalBadAccess      = 0x91,
-        eGdbSignalBadInstruction = 0x92,
-        eGdbSignalArithmetic     = 0x93,
-        eGdbSignalEmulation      = 0x94,
-        eGdbSignalSoftware       = 0x95,
-        eGdbSignalBreakpoint     = 0x96
-    };
-
-    //----------------------------------------------------------------------
-    // Used with SBHost::GetPath (lldb::PathType) to find files that are
-    // related to LLDB on the current host machine. Most files are relative
-    // to LLDB or are in known locations.
-    //----------------------------------------------------------------------
-    enum PathType
-    {
-        ePathTypeLLDBShlibDir,            // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
-        ePathTypeSupportExecutableDir,    // Find LLDB support executable directory (debugserver, etc)
-        ePathTypeHeaderDir,               // Find LLDB header file directory
-        ePathTypePythonDir,               // Find Python modules (PYTHONPATH) directory
-        ePathTypeLLDBSystemPlugins,       // System plug-ins directory
-        ePathTypeLLDBUserPlugins,         // User plug-ins directory
-        ePathTypeLLDBTempSystemDir,       // The LLDB temp directory for this system that will be cleaned up on exit
-        ePathTypeGlobalLLDBTempSystemDir, // The LLDB temp directory for this system, NOT cleaned up on a process exit.
-        ePathTypeClangDir                 // Find path to Clang builtin headers
-    };
-    
-    //----------------------------------------------------------------------
-    // Kind of member function
-    // Used by the type system
-    //----------------------------------------------------------------------
-    enum MemberFunctionKind
-    {
-        eMemberFunctionKindUnknown = 0,     // Not sure what the type of this is
-        eMemberFunctionKindConstructor,     // A function used to create instances
-        eMemberFunctionKindDestructor,      // A function used to tear down existing instances
-        eMemberFunctionKindInstanceMethod,  // A function that applies to a specific instance
-        eMemberFunctionKindStaticMethod     // A function that applies to a type rather than any instance
-    };
-
-
-    //----------------------------------------------------------------------
-    // String matching algorithm used by SBTarget
-    //----------------------------------------------------------------------
-    enum MatchType
-    {
-        eMatchTypeNormal,
-        eMatchTypeRegex,
-        eMatchTypeStartsWith
-    };
-    
-    //----------------------------------------------------------------------
-    // Bitmask that describes details about a type
-    //----------------------------------------------------------------------
-    FLAGS_ENUM(TypeFlags)
-    {
-        eTypeHasChildren        = (1u <<  0),
-        eTypeHasValue           = (1u <<  1),
-        eTypeIsArray            = (1u <<  2),
-        eTypeIsBlock            = (1u <<  3),
-        eTypeIsBuiltIn          = (1u <<  4),
-        eTypeIsClass            = (1u <<  5),
-        eTypeIsCPlusPlus        = (1u <<  6),
-        eTypeIsEnumeration      = (1u <<  7),
-        eTypeIsFuncPrototype    = (1u <<  8),
-        eTypeIsMember           = (1u <<  9),
-        eTypeIsObjC             = (1u << 10),
-        eTypeIsPointer          = (1u << 11),
-        eTypeIsReference        = (1u << 12),
-        eTypeIsStructUnion      = (1u << 13),
-        eTypeIsTemplate         = (1u << 14),
-        eTypeIsTypedef          = (1u << 15),
-        eTypeIsVector           = (1u << 16),
-        eTypeIsScalar           = (1u << 17),
-        eTypeIsInteger          = (1u << 18),
-        eTypeIsFloat            = (1u << 19),
-        eTypeIsComplex          = (1u << 20),
-        eTypeIsSigned           = (1u << 21)
-    };
-    
-    FLAGS_ENUM(CommandFlags)
-    {
-        //----------------------------------------------------------------------
-        // eCommandRequiresTarget
-        //
-        // Ensures a valid target is contained in m_exe_ctx prior to executing
-        // the command. If a target doesn't exist or is invalid, the command
-        // will fail and CommandObject::GetInvalidTargetDescription() will be
-        // returned as the error. CommandObject subclasses can override the
-        // virtual function for GetInvalidTargetDescription() to provide custom
-        // strings when needed.
-        //----------------------------------------------------------------------
-        eCommandRequiresTarget         = (1u << 0),
-        //----------------------------------------------------------------------
-        // eCommandRequiresProcess
-        //
-        // Ensures a valid process is contained in m_exe_ctx prior to executing
-        // the command. If a process doesn't exist or is invalid, the command
-        // will fail and CommandObject::GetInvalidProcessDescription() will be
-        // returned as the error. CommandObject subclasses can override the
-        // virtual function for GetInvalidProcessDescription() to provide custom
-        // strings when needed.
-        //----------------------------------------------------------------------
-        eCommandRequiresProcess        = (1u << 1),
-        //----------------------------------------------------------------------
-        // eCommandRequiresThread
-        //
-        // Ensures a valid thread is contained in m_exe_ctx prior to executing
-        // the command. If a thread doesn't exist or is invalid, the command
-        // will fail and CommandObject::GetInvalidThreadDescription() will be
-        // returned as the error. CommandObject subclasses can override the
-        // virtual function for GetInvalidThreadDescription() to provide custom
-        // strings when needed.
-        //----------------------------------------------------------------------
-        eCommandRequiresThread         = (1u << 2),
-        //----------------------------------------------------------------------
-        // eCommandRequiresFrame
-        //
-        // Ensures a valid frame is contained in m_exe_ctx prior to executing
-        // the command. If a frame doesn't exist or is invalid, the command
-        // will fail and CommandObject::GetInvalidFrameDescription() will be
-        // returned as the error. CommandObject subclasses can override the
-        // virtual function for GetInvalidFrameDescription() to provide custom
-        // strings when needed.
-        //----------------------------------------------------------------------
-        eCommandRequiresFrame          = (1u << 3),
-        //----------------------------------------------------------------------
-        // eCommandRequiresRegContext
-        //
-        // Ensures a valid register context (from the selected frame if there
-        // is a frame in m_exe_ctx, or from the selected thread from m_exe_ctx)
-        // is available from m_exe_ctx prior to executing the command. If a
-        // target doesn't exist or is invalid, the command will fail and
-        // CommandObject::GetInvalidRegContextDescription() will be returned as
-        // the error. CommandObject subclasses can override the virtual function
-        // for GetInvalidRegContextDescription() to provide custom strings when
-        // needed.
-        //----------------------------------------------------------------------
-        eCommandRequiresRegContext     = (1u << 4),
-        //----------------------------------------------------------------------
-        // eCommandTryTargetAPILock
-        //
-        // Attempts to acquire the target lock if a target is selected in the
-        // command interpreter. If the command object fails to acquire the API
-        // lock, the command will fail with an appropriate error message.
-        //----------------------------------------------------------------------
-        eCommandTryTargetAPILock       = (1u << 5),
-        //----------------------------------------------------------------------
-        // eCommandProcessMustBeLaunched
-        //
-        // Verifies that there is a launched process in m_exe_ctx, if there
-        // isn't, the command will fail with an appropriate error message.
-        //----------------------------------------------------------------------
-        eCommandProcessMustBeLaunched  = (1u << 6),
-        //----------------------------------------------------------------------
-        // eCommandProcessMustBePaused
-        //
-        // Verifies that there is a paused process in m_exe_ctx, if there
-        // isn't, the command will fail with an appropriate error message.
-        //----------------------------------------------------------------------
-        eCommandProcessMustBePaused    = (1u << 7)
-    };
-    
-    //----------------------------------------------------------------------
-    // Whether a summary should cap how much data it returns to users or not
-    //----------------------------------------------------------------------
-    enum TypeSummaryCapping
-    {
-        eTypeSummaryCapped = true,
-        eTypeSummaryUncapped = false
-    };
-
-} // namespace lldb
-
-#endif  // LLDB_lldb_enumerations_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-forward.h b/kcov-38/external/lldb/include/lldb/lldb-forward.h
deleted file mode 100644
index e0c2ae4b8b8d..000000000000
--- a/kcov-38/external/lldb/include/lldb/lldb-forward.h
+++ /dev/null
@@ -1,440 +0,0 @@
-//===-- lldb-forward.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_lldb_forward_h_
-#define LLDB_lldb_forward_h_
-
-#if defined(__cplusplus)
-
-#include "lldb/Utility/SharingPtr.h"
-
-//----------------------------------------------------------------------
-// lldb forward declarations
-//----------------------------------------------------------------------
-namespace lldb_private {
-
-class   ABI;
-class   Address;
-class   AddressImpl;
-class   AddressRange;
-class   AddressResolver;
-class   ArchSpec;
-class   Args;
-class   ASTResultSynthesizer;
-class   Baton;
-class   Block;
-class   Breakpoint;
-class   BreakpointID;
-class   BreakpointIDList;
-class   BreakpointList;
-class   BreakpointLocation;
-class   BreakpointLocationCollection;
-class   BreakpointLocationList;
-class   BreakpointOptions;
-class   BreakpointResolver;
-class   BreakpointSite;
-class   BreakpointSiteList;
-class   BroadcastEventSpec;
-class   Broadcaster;
-class   BroadcasterManager;
-class   CPPLanguageRuntime;
-class   ClangASTContext;
-class   ClangASTImporter;
-class   ClangASTMetadata;
-class   ClangASTSource;
-class   ClangASTType;
-class   ClangNamespaceDecl;
-class   ClangExpression;
-class   ClangExpressionDeclMap;
-class   ClangExpressionParser;
-class   ClangExpressionVariable;
-class   ClangExpressionVariableList;
-class   ClangExpressionVariableList;
-class   ClangExpressionVariables;
-class   ClangFunction;
-class   ClangModulesDeclVendor;
-class   ClangPersistentVariables;
-class   ClangUserExpression;
-class   ClangUtilityFunction;
-class   CommandInterpreter;
-class   CommandInterpreterRunOptions;
-class   CommandObject;
-class   CommandReturnObject;
-class   Communication;
-class   CompactUnwindInfo;
-class   CompileUnit;
-class   Condition;
-class   Connection;
-class   ConnectionFileDescriptor;
-class   ConstString;
-class   CXXSyntheticChildren;
-class   DWARFCallFrameInfo;
-class   DWARFExpression;
-class   DataBuffer;
-class   DataEncoder;
-class   DataExtractor;
-class   Debugger;
-class   Declaration;
-class   Disassembler;
-struct  DumpValueObjectOptions;
-class   DynamicCheckerFunctions;
-class   DynamicLoader;
-class   Editline;
-class   EmulateInstruction;
-class   Error;
-class   EvaluateExpressionOptions;
-class   Event;
-class   EventData;
-class   ExecutionContext;
-class   ExecutionContextRef;
-class   ExecutionContextRefLocker;
-class   ExecutionContextScope;
-class   File;
-class   FileSpec;
-class   FileSpecList;
-class   Flags;
-class   TypeCategoryImpl;
-class   FormatManager;
-class   FormattersMatchCandidate;
-class   FuncUnwinders;
-class   Function;
-class   FunctionInfo;
-class   InlineFunctionInfo;
-class   Instruction;
-class   InstructionList;
-class   InstrumentationRuntime;
-class   IOHandler;
-class   IOObject;
-class   IRExecutionUnit;
-class   JITLoader;
-class   JITLoaderList;
-class   LanguageRuntime;
-class   MemoryRegionInfo;
-class   LineTable;
-class   Listener;
-class   Log;
-class   LogChannel;
-class   Mangled;
-class   Materializer;
-class   MemoryHistory;
-class   Module;
-class   ModuleList;
-class   ModuleSpec;
-class   ModuleSpecList;
-class   Mutex;
-struct  NameSearchContext;
-class   ObjCLanguageRuntime;
-class   ObjectContainer;
-class   OptionGroup;
-class   OptionGroupOptions;
-class   OptionGroupPlatform;
-class   ObjectFile;
-class   ObjectFileJITDelegate;
-class   OperatingSystem;
-class   Options;
-class   OptionValue;
-class   OptionValueArch;
-class   OptionValueArgs;
-class   OptionValueArray;
-class   OptionValueBoolean;
-class   OptionValueChar;
-class   OptionValueDictionary;
-class   OptionValueEnumeration;
-class   OptionValueFileSpec;
-class   OptionValueFileSpecList;
-class   OptionValueFormat;
-class   OptionValueLanguage;
-class   OptionValueFormatEntity;
-class   OptionValuePathMappings;
-class   OptionValueProperties;
-class   OptionValueRegex;
-class   OptionValueSInt64;
-class   OptionValueString;
-class   OptionValueUInt64;
-class   OptionValueUUID;
-class   NamedOption;
-class   PathMappingList;
-class   Platform;
-class   Process;
-class   ProcessAttachInfo;
-class   ProcessModID;
-class   ProcessInfo;
-class   ProcessInstanceInfo;
-class   ProcessInstanceInfoList;
-class   ProcessInstanceInfoMatch;
-class   ProcessLaunchInfo;
-class   Property;
-struct  PropertyDefinition;
-class   RegisterCheckpoint;
-class   RegisterContext;
-class   RegisterLocation;
-class   RegisterLocationList;
-class   RegisterValue;
-class   RegularExpression;
-class   Scalar;
-class   ScriptInterpreter;
-class   ScriptInterpreterLocker;
-#ifndef LLDB_DISABLE_PYTHON
-struct  ScriptSummaryFormat;
-#endif
-class   SearchFilter;
-class   Section;
-class   SectionImpl;
-class   SectionList;
-class   SectionLoadHistory;
-class   SectionLoadList;
-class   Settings;
-class   SourceManager;
-class   SourceManagerImpl;
-class   StackFrame;
-class   StackFrameImpl;
-class   StackFrameList;
-class   StackID;
-class   StopInfo;
-class   Stoppoint;
-class   StoppointCallbackContext;
-class   StoppointLocation;
-class   Stream;
-template <unsigned N> class StreamBuffer;
-class   StreamFile;
-class   StreamString;
-class   StringList;
-struct  StringSummaryFormat;
-class   SystemRuntime;
-class   TypeSummaryImpl;
-class   TypeSummaryOptions;
-class   Symbol;
-class   SymbolContext;
-class   SymbolContextList;
-class   SymbolContextScope;
-class   SymbolContextSpecifier;
-class   SymbolFile;
-class   SymbolFileType;
-class   SymbolVendor;
-class   Symtab;
-class   SyntheticChildren;
-class   SyntheticChildrenFrontEnd;
-class   TypeFilterImpl;
-#ifndef LLDB_DISABLE_PYTHON
-class   ScriptedSyntheticChildren;
-#endif
-class   Queue;
-class   QueueItem;
-class   QueueImpl;
-class   Target;
-class   TargetList;
-class   TargetProperties;
-class   Thread;
-class   ThreadCollection;
-class   ThreadList;
-class   ThreadPlan;
-class   ThreadPlanBase;
-class   ThreadPlanRunToAddress;
-class   ThreadPlanStepInstruction;
-class   ThreadPlanStepOut;
-class   ThreadPlanStepOverBreakpoint;
-class   ThreadPlanStepRange;
-class   ThreadPlanStepThrough;
-class   ThreadPlanTracer;
-class   ThreadSpec;
-class   TimeValue;
-class   Type;
-class   TypeAndOrName;
-class   TypeCategoryMap;
-class   TypeImpl;
-class   TypeList;
-class   TypeListImpl;
-class   TypeMemberImpl;
-class   TypeMemberFunctionImpl;
-class   TypeEnumMemberImpl;
-class   TypeEnumMemberListImpl;
-class   TypeFormatImpl;
-class   TypeNameSpecifierImpl;
-class   TypePair;
-class   TypeValidatorImpl;
-class   UUID;
-class   UnixSignals;
-class   Unwind;
-class   UnwindAssembly;
-class   UnwindPlan;
-class   UnwindTable;
-class   VMRange;
-class   Value;
-class   ValueList;
-class   ValueObject;
-class   ValueObjectChild;
-class   ValueObjectConstResult;
-class   ValueObjectConstResultChild;
-class   ValueObjectConstResultImpl;
-class   ValueObjectList;
-class   ValueObjectPrinter;
-class   Variable;
-class   VariableList;
-class   Watchpoint;
-class   WatchpointList;
-class   WatchpointOptions;
-struct  LineEntry;
-
-} // namespace lldb_private
-
-//----------------------------------------------------------------------
-// lldb forward declarations
-//----------------------------------------------------------------------
-namespace lldb {
-    
-    typedef std::shared_ptr<lldb_private::ABI> ABISP;
-    typedef std::shared_ptr<lldb_private::Baton> BatonSP;
-    typedef std::shared_ptr<lldb_private::Block> BlockSP;
-    typedef std::shared_ptr<lldb_private::Breakpoint> BreakpointSP;
-    typedef std::weak_ptr<lldb_private::Breakpoint> BreakpointWP;
-    typedef std::shared_ptr<lldb_private::BreakpointSite> BreakpointSiteSP;
-    typedef std::weak_ptr<lldb_private::BreakpointSite> BreakpointSiteWP;
-    typedef std::shared_ptr<lldb_private::BreakpointLocation> BreakpointLocationSP;
-    typedef std::weak_ptr<lldb_private::BreakpointLocation> BreakpointLocationWP;
-    typedef std::shared_ptr<lldb_private::BreakpointResolver> BreakpointResolverSP;
-    typedef std::shared_ptr<lldb_private::Broadcaster> BroadcasterSP;
-    typedef std::unique_ptr<lldb_private::ClangASTContext> ClangASTContextUP;
-    typedef std::unique_ptr<lldb_private::ClangASTImporter> ClangASTImporterUP;
-    typedef std::unique_ptr<lldb_private::ClangASTSource> ClangASTSourceUP;
-    typedef std::shared_ptr<lldb_private::ClangExpressionVariable> ClangExpressionVariableSP;
-    typedef std::unique_ptr<lldb_private::ClangModulesDeclVendor> ClangModulesDeclVendorUP;
-    typedef std::unique_ptr<lldb_private::ClangPersistentVariables> ClangPersistentVariablesUP;
-    typedef std::shared_ptr<lldb_private::ClangUserExpression> ClangUserExpressionSP;
-    typedef std::shared_ptr<lldb_private::CommandObject> CommandObjectSP;
-    typedef std::shared_ptr<lldb_private::Communication> CommunicationSP;
-    typedef std::shared_ptr<lldb_private::Connection> ConnectionSP;
-    typedef std::shared_ptr<lldb_private::CompileUnit> CompUnitSP;
-    typedef std::shared_ptr<lldb_private::DataBuffer> DataBufferSP;
-    typedef std::shared_ptr<lldb_private::DataExtractor> DataExtractorSP;
-    typedef std::shared_ptr<lldb_private::Debugger> DebuggerSP;
-    typedef std::weak_ptr<lldb_private::Debugger> DebuggerWP;
-    typedef std::shared_ptr<lldb_private::Disassembler> DisassemblerSP;
-    typedef std::unique_ptr<lldb_private::DynamicCheckerFunctions> DynamicCheckerFunctionsUP;
-    typedef std::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
-    typedef std::unique_ptr<lldb_private::DynamicLoader> DynamicLoaderUP;
-    typedef std::shared_ptr<lldb_private::Event> EventSP;
-    typedef std::shared_ptr<lldb_private::ExecutionContextRef> ExecutionContextRefSP;
-    typedef std::shared_ptr<lldb_private::File> FileSP;
-    typedef std::shared_ptr<lldb_private::Function> FunctionSP;
-    typedef std::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
-    typedef std::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
-    typedef std::shared_ptr<lldb_private::Instruction> InstructionSP;
-    typedef std::shared_ptr<lldb_private::InstrumentationRuntime> InstrumentationRuntimeSP;
-    typedef std::shared_ptr<lldb_private::IOHandler> IOHandlerSP;
-    typedef std::shared_ptr<lldb_private::IOObject> IOObjectSP;
-    typedef std::shared_ptr<lldb_private::JITLoader> JITLoaderSP;
-    typedef std::unique_ptr<lldb_private::JITLoaderList> JITLoaderListUP;
-    typedef std::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
-    typedef std::shared_ptr<lldb_private::SystemRuntime> SystemRuntimeSP;
-    typedef std::unique_ptr<lldb_private::SystemRuntime> SystemRuntimeUP;
-    typedef std::shared_ptr<lldb_private::LineTable> LineTableSP;
-    typedef std::shared_ptr<lldb_private::Listener> ListenerSP;
-    typedef std::shared_ptr<lldb_private::LogChannel> LogChannelSP;
-    typedef std::shared_ptr<lldb_private::MemoryHistory> MemoryHistorySP;
-    typedef std::shared_ptr<lldb_private::Module> ModuleSP;
-    typedef std::weak_ptr<lldb_private::Module> ModuleWP;
-    typedef std::shared_ptr<lldb_private::ObjectFile> ObjectFileSP;
-    typedef std::weak_ptr<lldb_private::ObjectFile> ObjectFileWP;
-    typedef std::shared_ptr<lldb_private::ObjectFileJITDelegate> ObjectFileJITDelegateSP;
-    typedef std::weak_ptr<lldb_private::ObjectFileJITDelegate> ObjectFileJITDelegateWP;
-    typedef std::unique_ptr<lldb_private::OperatingSystem> OperatingSystemUP;
-    typedef std::shared_ptr<lldb_private::OptionValue> OptionValueSP;
-    typedef std::weak_ptr<lldb_private::OptionValue> OptionValueWP;
-    typedef std::shared_ptr<lldb_private::OptionValueArch> OptionValueArchSP;
-    typedef std::shared_ptr<lldb_private::OptionValueArgs> OptionValueArgsSP;
-    typedef std::shared_ptr<lldb_private::OptionValueArray> OptionValueArraySP;
-    typedef std::shared_ptr<lldb_private::OptionValueBoolean> OptionValueBooleanSP;
-    typedef std::shared_ptr<lldb_private::OptionValueDictionary> OptionValueDictionarySP;
-    typedef std::shared_ptr<lldb_private::OptionValueFileSpec> OptionValueFileSpecSP;
-    typedef std::shared_ptr<lldb_private::OptionValueFileSpecList> OptionValueFileSpecListSP;
-    typedef std::shared_ptr<lldb_private::OptionValueFormat> OptionValueFormatSP;
-    typedef std::shared_ptr<lldb_private::OptionValuePathMappings> OptionValuePathMappingsSP;
-    typedef std::shared_ptr<lldb_private::OptionValueProperties> OptionValuePropertiesSP;
-    typedef std::shared_ptr<lldb_private::OptionValueRegex> OptionValueRegexSP;
-    typedef std::shared_ptr<lldb_private::OptionValueSInt64> OptionValueSInt64SP;
-    typedef std::shared_ptr<lldb_private::OptionValueString> OptionValueStringSP;
-    typedef std::shared_ptr<lldb_private::OptionValueUInt64> OptionValueUInt64SP;
-    typedef std::shared_ptr<lldb_private::OptionValueUUID> OptionValueUUIDSP;
-    typedef std::shared_ptr<lldb_private::Platform> PlatformSP;
-    typedef std::shared_ptr<lldb_private::Process> ProcessSP;
-    typedef std::shared_ptr<lldb_private::ProcessAttachInfo> ProcessAttachInfoSP;
-    typedef std::shared_ptr<lldb_private::ProcessLaunchInfo> ProcessLaunchInfoSP;
-    typedef std::weak_ptr<lldb_private::Process> ProcessWP;
-    typedef std::shared_ptr<lldb_private::Property> PropertySP;
-    typedef std::shared_ptr<lldb_private::RegisterCheckpoint> RegisterCheckpointSP;
-    typedef std::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
-    typedef std::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
-    typedef std::shared_ptr<lldb_private::Queue> QueueSP;
-    typedef std::weak_ptr<lldb_private::Queue> QueueWP;
-    typedef std::shared_ptr<lldb_private::QueueItem> QueueItemSP;
-#ifndef LLDB_DISABLE_PYTHON
-    typedef std::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptSummaryFormatSP;
-#endif // #ifndef LLDB_DISABLE_PYTHON
-    typedef std::shared_ptr<lldb_private::Section> SectionSP;
-    typedef std::unique_ptr<lldb_private::SectionList> SectionListUP;
-    typedef std::weak_ptr<lldb_private::Section> SectionWP;
-    typedef std::shared_ptr<lldb_private::SectionLoadList> SectionLoadListSP;
-    typedef std::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
-    typedef std::shared_ptr<lldb_private::Settings> SettingsSP;
-    typedef std::unique_ptr<lldb_private::SourceManager> SourceManagerUP;
-    typedef std::shared_ptr<lldb_private::StackFrame> StackFrameSP;
-    typedef std::unique_ptr<lldb_private::StackFrame> StackFrameUP;
-    typedef std::weak_ptr<lldb_private::StackFrame> StackFrameWP;
-    typedef std::shared_ptr<lldb_private::StackFrameList> StackFrameListSP;
-    typedef std::shared_ptr<lldb_private::StopInfo> StopInfoSP;
-    typedef std::shared_ptr<lldb_private::StoppointLocation> StoppointLocationSP;
-    typedef std::shared_ptr<lldb_private::Stream> StreamSP;
-    typedef std::weak_ptr<lldb_private::Stream> StreamWP;
-    typedef std::shared_ptr<lldb_private::StreamFile> StreamFileSP;
-    typedef std::shared_ptr<lldb_private::StringSummaryFormat> StringTypeSummaryImplSP;
-    typedef std::shared_ptr<lldb_private::SymbolFile> SymbolFileSP;
-    typedef std::shared_ptr<lldb_private::SymbolFileType> SymbolFileTypeSP;
-    typedef std::weak_ptr<lldb_private::SymbolFileType> SymbolFileTypeWP;
-    typedef std::shared_ptr<lldb_private::SymbolContextSpecifier> SymbolContextSpecifierSP;
-    typedef std::unique_ptr<lldb_private::SymbolVendor> SymbolVendorUP;
-    typedef std::shared_ptr<lldb_private::SyntheticChildren> SyntheticChildrenSP;
-    typedef std::shared_ptr<lldb_private::SyntheticChildrenFrontEnd> SyntheticChildrenFrontEndSP;
-    typedef std::shared_ptr<lldb_private::Target> TargetSP;
-    typedef std::weak_ptr<lldb_private::Target> TargetWP;
-    typedef std::shared_ptr<lldb_private::TargetProperties> TargetPropertiesSP;
-    typedef std::shared_ptr<lldb_private::Thread> ThreadSP;
-    typedef std::weak_ptr<lldb_private::Thread> ThreadWP;
-    typedef std::shared_ptr<lldb_private::ThreadCollection> ThreadCollectionSP;
-    typedef std::shared_ptr<lldb_private::ThreadPlan> ThreadPlanSP;
-    typedef std::shared_ptr<lldb_private::ThreadPlanTracer> ThreadPlanTracerSP;
-    typedef std::shared_ptr<lldb_private::Type> TypeSP;
-    typedef std::weak_ptr<lldb_private::Type> TypeWP;
-    typedef std::shared_ptr<lldb_private::TypeCategoryImpl> TypeCategoryImplSP;
-    typedef std::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
-    typedef std::shared_ptr<lldb_private::TypeMemberFunctionImpl> TypeMemberFunctionImplSP;
-    typedef std::shared_ptr<lldb_private::TypeEnumMemberImpl> TypeEnumMemberImplSP;
-    typedef std::shared_ptr<lldb_private::TypeFilterImpl> TypeFilterImplSP;
-    typedef std::shared_ptr<lldb_private::TypeFormatImpl> TypeFormatImplSP;
-    typedef std::shared_ptr<lldb_private::TypeNameSpecifierImpl> TypeNameSpecifierImplSP;
-    typedef std::shared_ptr<lldb_private::TypeSummaryImpl> TypeSummaryImplSP;
-    typedef std::shared_ptr<lldb_private::TypeSummaryOptions> TypeSummaryOptionsSP;
-    typedef std::shared_ptr<lldb_private::TypeValidatorImpl> TypeValidatorImplSP;
-#ifndef LLDB_DISABLE_PYTHON
-    typedef std::shared_ptr<lldb_private::ScriptedSyntheticChildren> ScriptedSyntheticChildrenSP;
-#endif
-    typedef std::shared_ptr<lldb_private::UnwindAssembly> UnwindAssemblySP;
-    typedef std::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
-    typedef lldb_private::SharingPtr<lldb_private::ValueObject> ValueObjectSP;
-    typedef std::shared_ptr<lldb_private::Value> ValueSP;
-    typedef std::shared_ptr<lldb_private::ValueList> ValueListSP;
-    typedef std::shared_ptr<lldb_private::Variable> VariableSP;
-    typedef std::shared_ptr<lldb_private::VariableList> VariableListSP;
-    typedef std::shared_ptr<lldb_private::ValueObjectList> ValueObjectListSP;
-    typedef std::shared_ptr<lldb_private::Watchpoint> WatchpointSP;
-
-} // namespace lldb
-
-
-#endif  // #if defined(__cplusplus)
-#endif  // LLDB_lldb_forward_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-types.h b/kcov-38/external/lldb/include/lldb/lldb-types.h
deleted file mode 100644
index fe902073698d..000000000000
--- a/kcov-38/external/lldb/include/lldb/lldb-types.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//===-- lldb-types.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_lldb_types_h_
-#define LLDB_lldb_types_h_
-
-#include "lldb/lldb-enumerations.h"
-#include "lldb/lldb-forward.h"
-
-#include <assert.h>
-#include <signal.h>
-#include <stdint.h>
-
-//----------------------------------------------------------------------
-// All host systems must define:
-//  lldb::condition_t       The native condition type (or a substitute class) for conditions on the host system.
-//  lldb::mutex_t           The native mutex type for mutex objects on the host system.
-//  lldb::thread_t          The native thread type for spawned threads on the system
-//  lldb::thread_arg_t      The type of the one any only thread creation argument for the host system
-//  lldb::thread_result_t   The return type that gets returned when a thread finishes.
-//  lldb::thread_func_t     The function prototype used to spawn a thread on the host system.
-//  #define LLDB_INVALID_PROCESS_ID ...
-//  #define LLDB_INVALID_THREAD_ID ...
-//  #define LLDB_INVALID_HOST_THREAD ...
-//  #define IS_VALID_LLDB_HOST_THREAD ...
-//----------------------------------------------------------------------
-
-// TODO: Add a bunch of ifdefs to determine the host system and what
-// things should be defined. Currently MacOSX is being assumed by default
-// since that is what lldb was first developed for.
-
-#ifndef _MSC_VER
-#include <stdbool.h>
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-
-#include <process.h>
-
-namespace lldb
-{
-    typedef void*               mutex_t;
-    typedef void*               condition_t;
-    typedef void*               rwlock_t;
-    typedef void*               process_t;                  // Process type is HANDLE
-    typedef void*               thread_t;                   // Host thread type
-    typedef void*               file_t;                     // Host file type
-    typedef void*               pipe_t;                     // Host pipe type
-    typedef unsigned int __w64  socket_t;                   // Host socket type
-    typedef uint32_t            thread_key_t;
-    typedef void*               thread_arg_t;               // Host thread argument type
-    typedef unsigned            thread_result_t;            // Host thread result type
-    typedef thread_result_t     (*thread_func_t)(void *);   // Host thread function type
-}
-
-#else
-
-#include <pthread.h>
-
-namespace lldb
-{
-    //----------------------------------------------------------------------
-    // MacOSX Types
-    //----------------------------------------------------------------------
-    typedef ::pthread_mutex_t   mutex_t;
-    typedef pthread_cond_t      condition_t;
-    typedef pthread_rwlock_t    rwlock_t;
-    typedef uint64_t            process_t;                  // Process type is just a pid.
-    typedef pthread_t           thread_t;                   // Host thread type
-    typedef int                 file_t;                     // Host file type
-    typedef int                 pipe_t;                     // Host pipe type
-    typedef int                 socket_t;                   // Host socket type
-    typedef pthread_key_t       thread_key_t;
-    typedef void *              thread_arg_t;               // Host thread argument type
-    typedef void *              thread_result_t;            // Host thread result type
-    typedef void *              (*thread_func_t)(void *);   // Host thread function type
-} // namespace lldb
-
-#endif
-
-namespace lldb
-{
-    typedef void                (*LogOutputCallback) (const char *, void *baton);
-    typedef bool                (*CommandOverrideCallback)(void *baton, const char **argv);
-    typedef bool                (*CommandOverrideCallbackWithResult)(void *baton,
-                                                                     const char **argv,
-                                                                     lldb_private::CommandReturnObject &result);
-    typedef bool                (*ExpressionCancelCallback) (ExpressionEvaluationPhase phase, void *baton);
-}
-
-#define LLDB_INVALID_PROCESS             ((lldb::process_t)-1)
-#define LLDB_INVALID_HOST_THREAD         ((lldb::thread_t)NULL)
-#define IS_VALID_LLDB_HOST_THREAD(t)     ((t) != LLDB_INVALID_HOST_THREAD)
-
-#define LLDB_INVALID_HOST_TIME           { 0, 0 }
-
-namespace lldb 
-{
-    typedef uint64_t    addr_t;
-    typedef uint64_t    user_id_t;
-    typedef uint64_t    pid_t;
-    typedef uint64_t    tid_t;
-    typedef uint64_t    offset_t;
-    typedef int32_t     break_id_t;
-    typedef int32_t     watch_id_t;
-    typedef void *      clang_type_t;
-    typedef uint64_t    queue_id_t;
-}
-
-
-#endif  // LLDB_lldb_types_h_
diff --git a/kcov-38/external/lldb/include/lldb/lldb-versioning.h b/kcov-38/external/lldb/include/lldb/lldb-versioning.h
deleted file mode 100644
index d0498a569f58..000000000000
--- a/kcov-38/external/lldb/include/lldb/lldb-versioning.h
+++ /dev/null
@@ -1,1607 +0,0 @@
-//===-- lldb-versioning.h ----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_lldb_versioning_h_
-#define LLDB_lldb_versioning_h_
-
-//----------------------------------------------------------------------
-// LLDB API version
-//----------------------------------------------------------------------
-#define LLDB_API_MAJOR_VERSION 1
-#define LLDB_API_MINOR_VERSION 0
-
-/*
-  API versioning
- ---------------------------------
- 
- The LLDB API is versioned independently of the LLDB source base
- Our API version numbers are composed of a major and a minor number
-
- The major number means a complete and stable revision of the API. Major numbers are compatibility breakers
- (i.e. when we change the API major number, there is no promise of compatibility with the previous major version
-  and we are free to remove and/or change any APIs)
- Minor numbers are a work-in-progress evolution of the API. APIs will not be removed or changed across minor versions
- (minors do not break compatibility). However, we can deprecate APIs in minor versions or add new APIs in minor versions
- A deprecated API is supposedly going to be removed in the next major version and will generate a warning if used
- APIs we add in minor versions will not be removed (at least until the following major) but they might theoretically be deprecated
- in a following minor version
- Users are discouraged from using the LLDB version number to test for API features and should instead use the API version checking
- as discussed below
- 
-  API version checking
- ---------------------------------
- 
- You can (optionally) sign into an API version checking feature
- To do so you need to define three macros:
- LLDB_API_CHECK_VERSIONING - define to any value (or no value)
- LLDB_API_MAJOR_VERSION_WANTED - which major version of the LLDB API you are targeting
- LLDB_API_MINOR_VERSION_WANTED - which minor version of the LLDB API you are targeting
- 
- If these macros exist - LLDB will enable version checking of the public API
- 
- If LLDB_API_MAJOR_VERSION is not equal to LLDB_API_MAJOR_VERSION_WANTED we will immediately halt your compilation with an error
- This is by design, since we do not make any promise of compatibility across major versions - if you really want to test your luck, disable the versioning altogether
- 
- If the major version test passes, you have signed up for a specific minor version of the API
- Whenever we add or deprecate an API in a minor version, we will mark it with either
- LLDB_API_NEW_IN_DOT_x - this API is new in LLDB .x
- LLDB_API_DEPRECATED_IN_DOT_x - this API is deprecated as of .x
- 
- If you are using an API new in DOT_x
-  if LLDB_API_MINOR_VERSION_WANTED >= x then all is well, else you will get a compilation error
-   This is meant to prevent you from using APIs that are newer than whatever LLDB you want to target
-
- If you are using an API deprecated in DOT_x
-  if LLDB_API_MINOR_VERSION_WANTED >= x then you will get a compilation warning, else all is well
-  This is meant to let you know that you are using an API that is deprecated and might go away
- 
-  Caveats
- ---------------------------------
- 
- Version checking only works on clang on OSX - you will get an error if you try to enable it on any other OS/compiler
- If you want to enable version checking on other platforms, you will need to define appropriate implementations for
- LLDB_API_IMPL_DEPRECATED and LLDB_API_IMPL_TOONEW and any other infrastructure your compiler needs for this purpose
- 
- We have no deprecation-as-error mode
- 
- There is no support for API versioning in Python
- 
- We reserve to use macros whose names begin with LLDB_API_ and you should not use them in your source code as they might conflict
- with present or future macro names we are using to implement versioning
-*/
-
-// if you want the version checking to work on other OS/compiler, define appropriate IMPL_DEPRECATED/IMPL_TOONEW
-// and define LLDB_API_CHECK_VERSIONING_WORKS when you are ready to go live
-#if defined(__APPLE__) && defined(__clang__)
-#define LLDB_API_IMPL_DEPRECATED __attribute__((deprecated))
-#define LLDB_API_IMPL_TOONEW __attribute__((unavailable))
-#define LLDB_API_CHECK_VERSIONING_WORKS
-#endif
-
-#if defined(LLDB_API_CHECK_VERSIONING) && !defined(LLDB_API_CHECK_VERSIONING_WORKS)
-#error "API version checking will not work here - please disable or create and submit patches to lldb-versioning.h"
-#endif
-
-#if defined(LLDB_API_CHECK_VERSIONING_WORKS) && (!defined(LLDB_API_IMPL_DEPRECATED) || !defined(LLDB_API_IMPL_TOONEW))
-#error "LLDB_API_CHECK_VERSIONING_WORKS needs LLDB_API_IMPL_DEPRECATED and LLDB_API_IMPL_TOONEW to be defined"
-#endif
-
-#if defined(LLDB_API_CHECK_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED)
-
-#if defined (LLDB_API_MAJOR_VERSION) && (LLDB_API_MAJOR_VERSION != LLDB_API_MAJOR_VERSION_WANTED)
-#error "Cannot link using this LLDB version - public API versions are incompatible"
-#endif
-
-#define LLDB_API_MINOR_VERSION_DOT_0 0
-#define LLDB_API_MINOR_VERSION_DOT_1 1
-#define LLDB_API_MINOR_VERSION_DOT_2 2
-#define LLDB_API_MINOR_VERSION_DOT_3 3
-#define LLDB_API_MINOR_VERSION_DOT_4 4
-#define LLDB_API_MINOR_VERSION_DOT_5 5
-#define LLDB_API_MINOR_VERSION_DOT_6 6
-#define LLDB_API_MINOR_VERSION_DOT_7 7
-#define LLDB_API_MINOR_VERSION_DOT_8 8
-#define LLDB_API_MINOR_VERSION_DOT_9 9
-#define LLDB_API_MINOR_VERSION_DOT_10 10
-#define LLDB_API_MINOR_VERSION_DOT_11 11
-#define LLDB_API_MINOR_VERSION_DOT_12 12
-#define LLDB_API_MINOR_VERSION_DOT_13 13
-#define LLDB_API_MINOR_VERSION_DOT_14 14
-#define LLDB_API_MINOR_VERSION_DOT_15 15
-#define LLDB_API_MINOR_VERSION_DOT_16 16
-#define LLDB_API_MINOR_VERSION_DOT_17 17
-#define LLDB_API_MINOR_VERSION_DOT_18 18
-#define LLDB_API_MINOR_VERSION_DOT_19 19
-#define LLDB_API_MINOR_VERSION_DOT_20 20
-#define LLDB_API_MINOR_VERSION_DOT_21 21
-#define LLDB_API_MINOR_VERSION_DOT_22 22
-#define LLDB_API_MINOR_VERSION_DOT_23 23
-#define LLDB_API_MINOR_VERSION_DOT_24 24
-#define LLDB_API_MINOR_VERSION_DOT_25 25
-#define LLDB_API_MINOR_VERSION_DOT_26 26
-#define LLDB_API_MINOR_VERSION_DOT_27 27
-#define LLDB_API_MINOR_VERSION_DOT_28 28
-#define LLDB_API_MINOR_VERSION_DOT_29 29
-#define LLDB_API_MINOR_VERSION_DOT_30 30
-#define LLDB_API_MINOR_VERSION_DOT_31 31
-#define LLDB_API_MINOR_VERSION_DOT_32 32
-#define LLDB_API_MINOR_VERSION_DOT_33 33
-#define LLDB_API_MINOR_VERSION_DOT_34 34
-#define LLDB_API_MINOR_VERSION_DOT_35 35
-#define LLDB_API_MINOR_VERSION_DOT_36 36
-#define LLDB_API_MINOR_VERSION_DOT_37 37
-#define LLDB_API_MINOR_VERSION_DOT_38 38
-#define LLDB_API_MINOR_VERSION_DOT_39 39
-#define LLDB_API_MINOR_VERSION_DOT_40 40
-#define LLDB_API_MINOR_VERSION_DOT_41 41
-#define LLDB_API_MINOR_VERSION_DOT_42 42
-#define LLDB_API_MINOR_VERSION_DOT_43 43
-#define LLDB_API_MINOR_VERSION_DOT_44 44
-#define LLDB_API_MINOR_VERSION_DOT_45 45
-#define LLDB_API_MINOR_VERSION_DOT_46 46
-#define LLDB_API_MINOR_VERSION_DOT_47 47
-#define LLDB_API_MINOR_VERSION_DOT_48 48
-#define LLDB_API_MINOR_VERSION_DOT_49 49
-#define LLDB_API_MINOR_VERSION_DOT_50 50
-#define LLDB_API_MINOR_VERSION_DOT_51 51
-#define LLDB_API_MINOR_VERSION_DOT_52 52
-#define LLDB_API_MINOR_VERSION_DOT_53 53
-#define LLDB_API_MINOR_VERSION_DOT_54 54
-#define LLDB_API_MINOR_VERSION_DOT_55 55
-#define LLDB_API_MINOR_VERSION_DOT_56 56
-#define LLDB_API_MINOR_VERSION_DOT_57 57
-#define LLDB_API_MINOR_VERSION_DOT_58 58
-#define LLDB_API_MINOR_VERSION_DOT_59 59
-#define LLDB_API_MINOR_VERSION_DOT_60 60
-#define LLDB_API_MINOR_VERSION_DOT_61 61
-#define LLDB_API_MINOR_VERSION_DOT_62 62
-#define LLDB_API_MINOR_VERSION_DOT_63 63
-#define LLDB_API_MINOR_VERSION_DOT_64 64
-#define LLDB_API_MINOR_VERSION_DOT_65 65
-#define LLDB_API_MINOR_VERSION_DOT_66 66
-#define LLDB_API_MINOR_VERSION_DOT_67 67
-#define LLDB_API_MINOR_VERSION_DOT_68 68
-#define LLDB_API_MINOR_VERSION_DOT_69 69
-#define LLDB_API_MINOR_VERSION_DOT_70 70
-#define LLDB_API_MINOR_VERSION_DOT_71 71
-#define LLDB_API_MINOR_VERSION_DOT_72 72
-#define LLDB_API_MINOR_VERSION_DOT_73 73
-#define LLDB_API_MINOR_VERSION_DOT_74 74
-#define LLDB_API_MINOR_VERSION_DOT_75 75
-#define LLDB_API_MINOR_VERSION_DOT_76 76
-#define LLDB_API_MINOR_VERSION_DOT_77 77
-#define LLDB_API_MINOR_VERSION_DOT_78 78
-#define LLDB_API_MINOR_VERSION_DOT_79 79
-#define LLDB_API_MINOR_VERSION_DOT_80 80
-#define LLDB_API_MINOR_VERSION_DOT_81 81
-#define LLDB_API_MINOR_VERSION_DOT_82 82
-#define LLDB_API_MINOR_VERSION_DOT_83 83
-#define LLDB_API_MINOR_VERSION_DOT_84 84
-#define LLDB_API_MINOR_VERSION_DOT_85 85
-#define LLDB_API_MINOR_VERSION_DOT_86 86
-#define LLDB_API_MINOR_VERSION_DOT_87 87
-#define LLDB_API_MINOR_VERSION_DOT_88 88
-#define LLDB_API_MINOR_VERSION_DOT_89 89
-#define LLDB_API_MINOR_VERSION_DOT_90 90
-#define LLDB_API_MINOR_VERSION_DOT_91 91
-#define LLDB_API_MINOR_VERSION_DOT_92 92
-#define LLDB_API_MINOR_VERSION_DOT_93 93
-#define LLDB_API_MINOR_VERSION_DOT_94 94
-#define LLDB_API_MINOR_VERSION_DOT_95 95
-#define LLDB_API_MINOR_VERSION_DOT_96 96
-#define LLDB_API_MINOR_VERSION_DOT_97 97
-#define LLDB_API_MINOR_VERSION_DOT_98 98
-#define LLDB_API_MINOR_VERSION_DOT_99 99
-
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_0
-#define LLDB_API_NEW_IN_DOT_0 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_0
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_0
-#define LLDB_API_DEPRECATED_IN_DOT_0 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_0
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_1
-#define LLDB_API_NEW_IN_DOT_1 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_1
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_1
-#define LLDB_API_DEPRECATED_IN_DOT_1 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_1
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_2
-#define LLDB_API_NEW_IN_DOT_2 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_2
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_2
-#define LLDB_API_DEPRECATED_IN_DOT_2 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_2
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_3
-#define LLDB_API_NEW_IN_DOT_3 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_3
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_3
-#define LLDB_API_DEPRECATED_IN_DOT_3 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_3
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_4
-#define LLDB_API_NEW_IN_DOT_4 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_4
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_4
-#define LLDB_API_DEPRECATED_IN_DOT_4 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_4
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_5
-#define LLDB_API_NEW_IN_DOT_5 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_5
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_5
-#define LLDB_API_DEPRECATED_IN_DOT_5 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_5
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_6
-#define LLDB_API_NEW_IN_DOT_6 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_6
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_6
-#define LLDB_API_DEPRECATED_IN_DOT_6 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_6
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_7
-#define LLDB_API_NEW_IN_DOT_7 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_7
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_7
-#define LLDB_API_DEPRECATED_IN_DOT_7 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_7
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_8
-#define LLDB_API_NEW_IN_DOT_8 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_8
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_8
-#define LLDB_API_DEPRECATED_IN_DOT_8 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_8
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_9
-#define LLDB_API_NEW_IN_DOT_9 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_9
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_9
-#define LLDB_API_DEPRECATED_IN_DOT_9 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_9
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_10
-#define LLDB_API_NEW_IN_DOT_10 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_10
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_10
-#define LLDB_API_DEPRECATED_IN_DOT_10 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_10
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_11
-#define LLDB_API_NEW_IN_DOT_11 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_11
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_11
-#define LLDB_API_DEPRECATED_IN_DOT_11 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_11
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_12
-#define LLDB_API_NEW_IN_DOT_12 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_12
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_12
-#define LLDB_API_DEPRECATED_IN_DOT_12 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_12
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_13
-#define LLDB_API_NEW_IN_DOT_13 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_13
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_13
-#define LLDB_API_DEPRECATED_IN_DOT_13 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_13
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_14
-#define LLDB_API_NEW_IN_DOT_14 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_14
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_14
-#define LLDB_API_DEPRECATED_IN_DOT_14 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_14
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_15
-#define LLDB_API_NEW_IN_DOT_15 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_15
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_15
-#define LLDB_API_DEPRECATED_IN_DOT_15 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_15
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_16
-#define LLDB_API_NEW_IN_DOT_16 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_16
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_16
-#define LLDB_API_DEPRECATED_IN_DOT_16 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_16
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_17
-#define LLDB_API_NEW_IN_DOT_17 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_17
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_17
-#define LLDB_API_DEPRECATED_IN_DOT_17 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_17
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_18
-#define LLDB_API_NEW_IN_DOT_18 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_18
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_18
-#define LLDB_API_DEPRECATED_IN_DOT_18 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_18
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_19
-#define LLDB_API_NEW_IN_DOT_19 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_19
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_19
-#define LLDB_API_DEPRECATED_IN_DOT_19 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_19
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_20
-#define LLDB_API_NEW_IN_DOT_20 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_20
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_20
-#define LLDB_API_DEPRECATED_IN_DOT_20 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_20
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_21
-#define LLDB_API_NEW_IN_DOT_21 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_21
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_21
-#define LLDB_API_DEPRECATED_IN_DOT_21 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_21
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_22
-#define LLDB_API_NEW_IN_DOT_22 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_22
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_22
-#define LLDB_API_DEPRECATED_IN_DOT_22 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_22
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_23
-#define LLDB_API_NEW_IN_DOT_23 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_23
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_23
-#define LLDB_API_DEPRECATED_IN_DOT_23 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_23
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_24
-#define LLDB_API_NEW_IN_DOT_24 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_24
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_24
-#define LLDB_API_DEPRECATED_IN_DOT_24 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_24
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_25
-#define LLDB_API_NEW_IN_DOT_25 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_25
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_25
-#define LLDB_API_DEPRECATED_IN_DOT_25 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_25
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_26
-#define LLDB_API_NEW_IN_DOT_26 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_26
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_26
-#define LLDB_API_DEPRECATED_IN_DOT_26 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_26
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_27
-#define LLDB_API_NEW_IN_DOT_27 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_27
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_27
-#define LLDB_API_DEPRECATED_IN_DOT_27 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_27
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_28
-#define LLDB_API_NEW_IN_DOT_28 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_28
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_28
-#define LLDB_API_DEPRECATED_IN_DOT_28 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_28
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_29
-#define LLDB_API_NEW_IN_DOT_29 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_29
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_29
-#define LLDB_API_DEPRECATED_IN_DOT_29 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_29
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_30
-#define LLDB_API_NEW_IN_DOT_30 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_30
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_30
-#define LLDB_API_DEPRECATED_IN_DOT_30 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_30
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_31
-#define LLDB_API_NEW_IN_DOT_31 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_31
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_31
-#define LLDB_API_DEPRECATED_IN_DOT_31 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_31
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_32
-#define LLDB_API_NEW_IN_DOT_32 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_32
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_32
-#define LLDB_API_DEPRECATED_IN_DOT_32 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_32
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_33
-#define LLDB_API_NEW_IN_DOT_33 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_33
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_33
-#define LLDB_API_DEPRECATED_IN_DOT_33 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_33
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_34
-#define LLDB_API_NEW_IN_DOT_34 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_34
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_34
-#define LLDB_API_DEPRECATED_IN_DOT_34 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_34
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_35
-#define LLDB_API_NEW_IN_DOT_35 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_35
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_35
-#define LLDB_API_DEPRECATED_IN_DOT_35 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_35
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_36
-#define LLDB_API_NEW_IN_DOT_36 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_36
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_36
-#define LLDB_API_DEPRECATED_IN_DOT_36 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_36
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_37
-#define LLDB_API_NEW_IN_DOT_37 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_37
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_37
-#define LLDB_API_DEPRECATED_IN_DOT_37 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_37
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_38
-#define LLDB_API_NEW_IN_DOT_38 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_38
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_38
-#define LLDB_API_DEPRECATED_IN_DOT_38 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_38
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_39
-#define LLDB_API_NEW_IN_DOT_39 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_39
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_39
-#define LLDB_API_DEPRECATED_IN_DOT_39 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_39
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_40
-#define LLDB_API_NEW_IN_DOT_40 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_40
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_40
-#define LLDB_API_DEPRECATED_IN_DOT_40 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_40
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_41
-#define LLDB_API_NEW_IN_DOT_41 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_41
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_41
-#define LLDB_API_DEPRECATED_IN_DOT_41 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_41
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_42
-#define LLDB_API_NEW_IN_DOT_42 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_42
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_42
-#define LLDB_API_DEPRECATED_IN_DOT_42 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_42
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_43
-#define LLDB_API_NEW_IN_DOT_43 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_43
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_43
-#define LLDB_API_DEPRECATED_IN_DOT_43 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_43
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_44
-#define LLDB_API_NEW_IN_DOT_44 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_44
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_44
-#define LLDB_API_DEPRECATED_IN_DOT_44 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_44
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_45
-#define LLDB_API_NEW_IN_DOT_45 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_45
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_45
-#define LLDB_API_DEPRECATED_IN_DOT_45 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_45
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_46
-#define LLDB_API_NEW_IN_DOT_46 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_46
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_46
-#define LLDB_API_DEPRECATED_IN_DOT_46 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_46
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_47
-#define LLDB_API_NEW_IN_DOT_47 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_47
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_47
-#define LLDB_API_DEPRECATED_IN_DOT_47 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_47
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_48
-#define LLDB_API_NEW_IN_DOT_48 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_48
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_48
-#define LLDB_API_DEPRECATED_IN_DOT_48 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_48
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_49
-#define LLDB_API_NEW_IN_DOT_49 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_49
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_49
-#define LLDB_API_DEPRECATED_IN_DOT_49 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_49
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_50
-#define LLDB_API_NEW_IN_DOT_50 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_50
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_50
-#define LLDB_API_DEPRECATED_IN_DOT_50 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_50
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_51
-#define LLDB_API_NEW_IN_DOT_51 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_51
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_51
-#define LLDB_API_DEPRECATED_IN_DOT_51 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_51
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_52
-#define LLDB_API_NEW_IN_DOT_52 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_52
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_52
-#define LLDB_API_DEPRECATED_IN_DOT_52 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_52
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_53
-#define LLDB_API_NEW_IN_DOT_53 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_53
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_53
-#define LLDB_API_DEPRECATED_IN_DOT_53 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_53
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_54
-#define LLDB_API_NEW_IN_DOT_54 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_54
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_54
-#define LLDB_API_DEPRECATED_IN_DOT_54 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_54
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_55
-#define LLDB_API_NEW_IN_DOT_55 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_55
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_55
-#define LLDB_API_DEPRECATED_IN_DOT_55 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_55
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_56
-#define LLDB_API_NEW_IN_DOT_56 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_56
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_56
-#define LLDB_API_DEPRECATED_IN_DOT_56 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_56
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_57
-#define LLDB_API_NEW_IN_DOT_57 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_57
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_57
-#define LLDB_API_DEPRECATED_IN_DOT_57 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_57
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_58
-#define LLDB_API_NEW_IN_DOT_58 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_58
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_58
-#define LLDB_API_DEPRECATED_IN_DOT_58 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_58
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_59
-#define LLDB_API_NEW_IN_DOT_59 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_59
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_59
-#define LLDB_API_DEPRECATED_IN_DOT_59 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_59
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_60
-#define LLDB_API_NEW_IN_DOT_60 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_60
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_60
-#define LLDB_API_DEPRECATED_IN_DOT_60 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_60
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_61
-#define LLDB_API_NEW_IN_DOT_61 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_61
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_61
-#define LLDB_API_DEPRECATED_IN_DOT_61 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_61
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_62
-#define LLDB_API_NEW_IN_DOT_62 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_62
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_62
-#define LLDB_API_DEPRECATED_IN_DOT_62 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_62
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_63
-#define LLDB_API_NEW_IN_DOT_63 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_63
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_63
-#define LLDB_API_DEPRECATED_IN_DOT_63 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_63
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_64
-#define LLDB_API_NEW_IN_DOT_64 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_64
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_64
-#define LLDB_API_DEPRECATED_IN_DOT_64 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_64
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_65
-#define LLDB_API_NEW_IN_DOT_65 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_65
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_65
-#define LLDB_API_DEPRECATED_IN_DOT_65 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_65
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_66
-#define LLDB_API_NEW_IN_DOT_66 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_66
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_66
-#define LLDB_API_DEPRECATED_IN_DOT_66 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_66
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_67
-#define LLDB_API_NEW_IN_DOT_67 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_67
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_67
-#define LLDB_API_DEPRECATED_IN_DOT_67 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_67
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_68
-#define LLDB_API_NEW_IN_DOT_68 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_68
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_68
-#define LLDB_API_DEPRECATED_IN_DOT_68 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_68
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_69
-#define LLDB_API_NEW_IN_DOT_69 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_69
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_69
-#define LLDB_API_DEPRECATED_IN_DOT_69 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_69
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_70
-#define LLDB_API_NEW_IN_DOT_70 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_70
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_70
-#define LLDB_API_DEPRECATED_IN_DOT_70 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_70
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_71
-#define LLDB_API_NEW_IN_DOT_71 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_71
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_71
-#define LLDB_API_DEPRECATED_IN_DOT_71 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_71
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_72
-#define LLDB_API_NEW_IN_DOT_72 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_72
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_72
-#define LLDB_API_DEPRECATED_IN_DOT_72 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_72
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_73
-#define LLDB_API_NEW_IN_DOT_73 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_73
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_73
-#define LLDB_API_DEPRECATED_IN_DOT_73 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_73
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_74
-#define LLDB_API_NEW_IN_DOT_74 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_74
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_74
-#define LLDB_API_DEPRECATED_IN_DOT_74 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_74
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_75
-#define LLDB_API_NEW_IN_DOT_75 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_75
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_75
-#define LLDB_API_DEPRECATED_IN_DOT_75 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_75
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_76
-#define LLDB_API_NEW_IN_DOT_76 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_76
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_76
-#define LLDB_API_DEPRECATED_IN_DOT_76 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_76
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_77
-#define LLDB_API_NEW_IN_DOT_77 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_77
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_77
-#define LLDB_API_DEPRECATED_IN_DOT_77 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_77
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_78
-#define LLDB_API_NEW_IN_DOT_78 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_78
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_78
-#define LLDB_API_DEPRECATED_IN_DOT_78 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_78
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_79
-#define LLDB_API_NEW_IN_DOT_79 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_79
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_79
-#define LLDB_API_DEPRECATED_IN_DOT_79 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_79
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_80
-#define LLDB_API_NEW_IN_DOT_80 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_80
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_80
-#define LLDB_API_DEPRECATED_IN_DOT_80 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_80
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_81
-#define LLDB_API_NEW_IN_DOT_81 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_81
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_81
-#define LLDB_API_DEPRECATED_IN_DOT_81 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_81
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_82
-#define LLDB_API_NEW_IN_DOT_82 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_82
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_82
-#define LLDB_API_DEPRECATED_IN_DOT_82 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_82
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_83
-#define LLDB_API_NEW_IN_DOT_83 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_83
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_83
-#define LLDB_API_DEPRECATED_IN_DOT_83 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_83
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_84
-#define LLDB_API_NEW_IN_DOT_84 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_84
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_84
-#define LLDB_API_DEPRECATED_IN_DOT_84 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_84
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_85
-#define LLDB_API_NEW_IN_DOT_85 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_85
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_85
-#define LLDB_API_DEPRECATED_IN_DOT_85 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_85
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_86
-#define LLDB_API_NEW_IN_DOT_86 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_86
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_86
-#define LLDB_API_DEPRECATED_IN_DOT_86 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_86
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_87
-#define LLDB_API_NEW_IN_DOT_87 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_87
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_87
-#define LLDB_API_DEPRECATED_IN_DOT_87 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_87
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_88
-#define LLDB_API_NEW_IN_DOT_88 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_88
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_88
-#define LLDB_API_DEPRECATED_IN_DOT_88 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_88
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_89
-#define LLDB_API_NEW_IN_DOT_89 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_89
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_89
-#define LLDB_API_DEPRECATED_IN_DOT_89 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_89
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_90
-#define LLDB_API_NEW_IN_DOT_90 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_90
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_90
-#define LLDB_API_DEPRECATED_IN_DOT_90 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_90
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_91
-#define LLDB_API_NEW_IN_DOT_91 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_91
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_91
-#define LLDB_API_DEPRECATED_IN_DOT_91 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_91
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_92
-#define LLDB_API_NEW_IN_DOT_92 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_92
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_92
-#define LLDB_API_DEPRECATED_IN_DOT_92 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_92
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_93
-#define LLDB_API_NEW_IN_DOT_93 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_93
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_93
-#define LLDB_API_DEPRECATED_IN_DOT_93 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_93
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_94
-#define LLDB_API_NEW_IN_DOT_94 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_94
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_94
-#define LLDB_API_DEPRECATED_IN_DOT_94 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_94
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_95
-#define LLDB_API_NEW_IN_DOT_95 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_95
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_95
-#define LLDB_API_DEPRECATED_IN_DOT_95 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_95
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_96
-#define LLDB_API_NEW_IN_DOT_96 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_96
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_96
-#define LLDB_API_DEPRECATED_IN_DOT_96 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_96
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_97
-#define LLDB_API_NEW_IN_DOT_97 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_97
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_97
-#define LLDB_API_DEPRECATED_IN_DOT_97 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_97
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_98
-#define LLDB_API_NEW_IN_DOT_98 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_98
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_98
-#define LLDB_API_DEPRECATED_IN_DOT_98 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_98
-#endif
-#if LLDB_API_MINOR_VERSION_WANTED < LLDB_API_MINOR_VERSION_DOT_99
-#define LLDB_API_NEW_IN_DOT_99 LLDB_API_IMPL_TOONEW
-#else
-#define LLDB_API_NEW_IN_DOT_99
-#endif
-
-
-#if LLDB_API_MINOR_VERSION_WANTED >= LLDB_API_MINOR_VERSION_DOT_99
-#define LLDB_API_DEPRECATED_IN_DOT_99 LLDB_API_IMPL_DEPRECATED
-#else
-#define LLDB_API_DEPRECATED_IN_DOT_99
-#endif
-
-#else // defined(LLDB_CHECK_API_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED) && defined (LLDB_API_MAJOR_VERSION)
-
-#define LLDB_API_NEW_IN_DOT_0
-#define LLDB_API_DEPRECATED_IN_DOT_0
-#define LLDB_API_NEW_IN_DOT_1
-#define LLDB_API_DEPRECATED_IN_DOT_1
-#define LLDB_API_NEW_IN_DOT_2
-#define LLDB_API_DEPRECATED_IN_DOT_2
-#define LLDB_API_NEW_IN_DOT_3
-#define LLDB_API_DEPRECATED_IN_DOT_3
-#define LLDB_API_NEW_IN_DOT_4
-#define LLDB_API_DEPRECATED_IN_DOT_4
-#define LLDB_API_NEW_IN_DOT_5
-#define LLDB_API_DEPRECATED_IN_DOT_5
-#define LLDB_API_NEW_IN_DOT_6
-#define LLDB_API_DEPRECATED_IN_DOT_6
-#define LLDB_API_NEW_IN_DOT_7
-#define LLDB_API_DEPRECATED_IN_DOT_7
-#define LLDB_API_NEW_IN_DOT_8
-#define LLDB_API_DEPRECATED_IN_DOT_8
-#define LLDB_API_NEW_IN_DOT_9
-#define LLDB_API_DEPRECATED_IN_DOT_9
-#define LLDB_API_NEW_IN_DOT_10
-#define LLDB_API_DEPRECATED_IN_DOT_10
-#define LLDB_API_NEW_IN_DOT_11
-#define LLDB_API_DEPRECATED_IN_DOT_11
-#define LLDB_API_NEW_IN_DOT_12
-#define LLDB_API_DEPRECATED_IN_DOT_12
-#define LLDB_API_NEW_IN_DOT_13
-#define LLDB_API_DEPRECATED_IN_DOT_13
-#define LLDB_API_NEW_IN_DOT_14
-#define LLDB_API_DEPRECATED_IN_DOT_14
-#define LLDB_API_NEW_IN_DOT_15
-#define LLDB_API_DEPRECATED_IN_DOT_15
-#define LLDB_API_NEW_IN_DOT_16
-#define LLDB_API_DEPRECATED_IN_DOT_16
-#define LLDB_API_NEW_IN_DOT_17
-#define LLDB_API_DEPRECATED_IN_DOT_17
-#define LLDB_API_NEW_IN_DOT_18
-#define LLDB_API_DEPRECATED_IN_DOT_18
-#define LLDB_API_NEW_IN_DOT_19
-#define LLDB_API_DEPRECATED_IN_DOT_19
-#define LLDB_API_NEW_IN_DOT_20
-#define LLDB_API_DEPRECATED_IN_DOT_20
-#define LLDB_API_NEW_IN_DOT_21
-#define LLDB_API_DEPRECATED_IN_DOT_21
-#define LLDB_API_NEW_IN_DOT_22
-#define LLDB_API_DEPRECATED_IN_DOT_22
-#define LLDB_API_NEW_IN_DOT_23
-#define LLDB_API_DEPRECATED_IN_DOT_23
-#define LLDB_API_NEW_IN_DOT_24
-#define LLDB_API_DEPRECATED_IN_DOT_24
-#define LLDB_API_NEW_IN_DOT_25
-#define LLDB_API_DEPRECATED_IN_DOT_25
-#define LLDB_API_NEW_IN_DOT_26
-#define LLDB_API_DEPRECATED_IN_DOT_26
-#define LLDB_API_NEW_IN_DOT_27
-#define LLDB_API_DEPRECATED_IN_DOT_27
-#define LLDB_API_NEW_IN_DOT_28
-#define LLDB_API_DEPRECATED_IN_DOT_28
-#define LLDB_API_NEW_IN_DOT_29
-#define LLDB_API_DEPRECATED_IN_DOT_29
-#define LLDB_API_NEW_IN_DOT_30
-#define LLDB_API_DEPRECATED_IN_DOT_30
-#define LLDB_API_NEW_IN_DOT_31
-#define LLDB_API_DEPRECATED_IN_DOT_31
-#define LLDB_API_NEW_IN_DOT_32
-#define LLDB_API_DEPRECATED_IN_DOT_32
-#define LLDB_API_NEW_IN_DOT_33
-#define LLDB_API_DEPRECATED_IN_DOT_33
-#define LLDB_API_NEW_IN_DOT_34
-#define LLDB_API_DEPRECATED_IN_DOT_34
-#define LLDB_API_NEW_IN_DOT_35
-#define LLDB_API_DEPRECATED_IN_DOT_35
-#define LLDB_API_NEW_IN_DOT_36
-#define LLDB_API_DEPRECATED_IN_DOT_36
-#define LLDB_API_NEW_IN_DOT_37
-#define LLDB_API_DEPRECATED_IN_DOT_37
-#define LLDB_API_NEW_IN_DOT_38
-#define LLDB_API_DEPRECATED_IN_DOT_38
-#define LLDB_API_NEW_IN_DOT_39
-#define LLDB_API_DEPRECATED_IN_DOT_39
-#define LLDB_API_NEW_IN_DOT_40
-#define LLDB_API_DEPRECATED_IN_DOT_40
-#define LLDB_API_NEW_IN_DOT_41
-#define LLDB_API_DEPRECATED_IN_DOT_41
-#define LLDB_API_NEW_IN_DOT_42
-#define LLDB_API_DEPRECATED_IN_DOT_42
-#define LLDB_API_NEW_IN_DOT_43
-#define LLDB_API_DEPRECATED_IN_DOT_43
-#define LLDB_API_NEW_IN_DOT_44
-#define LLDB_API_DEPRECATED_IN_DOT_44
-#define LLDB_API_NEW_IN_DOT_45
-#define LLDB_API_DEPRECATED_IN_DOT_45
-#define LLDB_API_NEW_IN_DOT_46
-#define LLDB_API_DEPRECATED_IN_DOT_46
-#define LLDB_API_NEW_IN_DOT_47
-#define LLDB_API_DEPRECATED_IN_DOT_47
-#define LLDB_API_NEW_IN_DOT_48
-#define LLDB_API_DEPRECATED_IN_DOT_48
-#define LLDB_API_NEW_IN_DOT_49
-#define LLDB_API_DEPRECATED_IN_DOT_49
-#define LLDB_API_NEW_IN_DOT_50
-#define LLDB_API_DEPRECATED_IN_DOT_50
-#define LLDB_API_NEW_IN_DOT_51
-#define LLDB_API_DEPRECATED_IN_DOT_51
-#define LLDB_API_NEW_IN_DOT_52
-#define LLDB_API_DEPRECATED_IN_DOT_52
-#define LLDB_API_NEW_IN_DOT_53
-#define LLDB_API_DEPRECATED_IN_DOT_53
-#define LLDB_API_NEW_IN_DOT_54
-#define LLDB_API_DEPRECATED_IN_DOT_54
-#define LLDB_API_NEW_IN_DOT_55
-#define LLDB_API_DEPRECATED_IN_DOT_55
-#define LLDB_API_NEW_IN_DOT_56
-#define LLDB_API_DEPRECATED_IN_DOT_56
-#define LLDB_API_NEW_IN_DOT_57
-#define LLDB_API_DEPRECATED_IN_DOT_57
-#define LLDB_API_NEW_IN_DOT_58
-#define LLDB_API_DEPRECATED_IN_DOT_58
-#define LLDB_API_NEW_IN_DOT_59
-#define LLDB_API_DEPRECATED_IN_DOT_59
-#define LLDB_API_NEW_IN_DOT_60
-#define LLDB_API_DEPRECATED_IN_DOT_60
-#define LLDB_API_NEW_IN_DOT_61
-#define LLDB_API_DEPRECATED_IN_DOT_61
-#define LLDB_API_NEW_IN_DOT_62
-#define LLDB_API_DEPRECATED_IN_DOT_62
-#define LLDB_API_NEW_IN_DOT_63
-#define LLDB_API_DEPRECATED_IN_DOT_63
-#define LLDB_API_NEW_IN_DOT_64
-#define LLDB_API_DEPRECATED_IN_DOT_64
-#define LLDB_API_NEW_IN_DOT_65
-#define LLDB_API_DEPRECATED_IN_DOT_65
-#define LLDB_API_NEW_IN_DOT_66
-#define LLDB_API_DEPRECATED_IN_DOT_66
-#define LLDB_API_NEW_IN_DOT_67
-#define LLDB_API_DEPRECATED_IN_DOT_67
-#define LLDB_API_NEW_IN_DOT_68
-#define LLDB_API_DEPRECATED_IN_DOT_68
-#define LLDB_API_NEW_IN_DOT_69
-#define LLDB_API_DEPRECATED_IN_DOT_69
-#define LLDB_API_NEW_IN_DOT_70
-#define LLDB_API_DEPRECATED_IN_DOT_70
-#define LLDB_API_NEW_IN_DOT_71
-#define LLDB_API_DEPRECATED_IN_DOT_71
-#define LLDB_API_NEW_IN_DOT_72
-#define LLDB_API_DEPRECATED_IN_DOT_72
-#define LLDB_API_NEW_IN_DOT_73
-#define LLDB_API_DEPRECATED_IN_DOT_73
-#define LLDB_API_NEW_IN_DOT_74
-#define LLDB_API_DEPRECATED_IN_DOT_74
-#define LLDB_API_NEW_IN_DOT_75
-#define LLDB_API_DEPRECATED_IN_DOT_75
-#define LLDB_API_NEW_IN_DOT_76
-#define LLDB_API_DEPRECATED_IN_DOT_76
-#define LLDB_API_NEW_IN_DOT_77
-#define LLDB_API_DEPRECATED_IN_DOT_77
-#define LLDB_API_NEW_IN_DOT_78
-#define LLDB_API_DEPRECATED_IN_DOT_78
-#define LLDB_API_NEW_IN_DOT_79
-#define LLDB_API_DEPRECATED_IN_DOT_79
-#define LLDB_API_NEW_IN_DOT_80
-#define LLDB_API_DEPRECATED_IN_DOT_80
-#define LLDB_API_NEW_IN_DOT_81
-#define LLDB_API_DEPRECATED_IN_DOT_81
-#define LLDB_API_NEW_IN_DOT_82
-#define LLDB_API_DEPRECATED_IN_DOT_82
-#define LLDB_API_NEW_IN_DOT_83
-#define LLDB_API_DEPRECATED_IN_DOT_83
-#define LLDB_API_NEW_IN_DOT_84
-#define LLDB_API_DEPRECATED_IN_DOT_84
-#define LLDB_API_NEW_IN_DOT_85
-#define LLDB_API_DEPRECATED_IN_DOT_85
-#define LLDB_API_NEW_IN_DOT_86
-#define LLDB_API_DEPRECATED_IN_DOT_86
-#define LLDB_API_NEW_IN_DOT_87
-#define LLDB_API_DEPRECATED_IN_DOT_87
-#define LLDB_API_NEW_IN_DOT_88
-#define LLDB_API_DEPRECATED_IN_DOT_88
-#define LLDB_API_NEW_IN_DOT_89
-#define LLDB_API_DEPRECATED_IN_DOT_89
-#define LLDB_API_NEW_IN_DOT_90
-#define LLDB_API_DEPRECATED_IN_DOT_90
-#define LLDB_API_NEW_IN_DOT_91
-#define LLDB_API_DEPRECATED_IN_DOT_91
-#define LLDB_API_NEW_IN_DOT_92
-#define LLDB_API_DEPRECATED_IN_DOT_92
-#define LLDB_API_NEW_IN_DOT_93
-#define LLDB_API_DEPRECATED_IN_DOT_93
-#define LLDB_API_NEW_IN_DOT_94
-#define LLDB_API_DEPRECATED_IN_DOT_94
-#define LLDB_API_NEW_IN_DOT_95
-#define LLDB_API_DEPRECATED_IN_DOT_95
-#define LLDB_API_NEW_IN_DOT_96
-#define LLDB_API_DEPRECATED_IN_DOT_96
-#define LLDB_API_NEW_IN_DOT_97
-#define LLDB_API_DEPRECATED_IN_DOT_97
-#define LLDB_API_NEW_IN_DOT_98
-#define LLDB_API_DEPRECATED_IN_DOT_98
-#define LLDB_API_NEW_IN_DOT_99
-#define LLDB_API_DEPRECATED_IN_DOT_99
-#endif // defined(LLDB_CHECK_API_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED) && defined (LLDB_API_MAJOR_VERSION)
-
-#endif // LLDB_lldb_versioning_h_
diff --git a/kcov-38/src/CMakeLists.txt b/kcov-38/src/CMakeLists.txt
deleted file mode 100644
index 3c120aa26b72..000000000000
--- a/kcov-38/src/CMakeLists.txt
+++ /dev/null
@@ -1,460 +0,0 @@
-find_package (Threads)
-find_package (Bfd)
-
-include(TargetArch)
-target_architecture(CMAKE_TARGET_ARCHITECTURES)
-message(STATUS "Target architectures: ${CMAKE_TARGET_ARCHITECTURES}")
-
-find_package (ZLIB REQUIRED)
-find_package (CURL)
-
-if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-set (DL_LIBRARY "")
-else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-find_library (DL_LIBRARY NAMES dl)
-if (DL_LIBRARY)
-    message (STATUS "Found DL: ${DL_LIBRARY}")
-else (DL_LIBRARY)
-    message (FATAL_ERROR "Could NOT find DL")
-endif (DL_LIBRARY)
-endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-
-if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-find_library (INTL_LIBRARY NAMES intl)
-if (INTL_LIBRARY)
-    message (STATUS "Found INTL: ${INTL_LIBRARY}")
-else (INTL_LIBRARY)
-    message (FATAL_ERROR "Could NOT find INTL")
-endif (INTL_LIBRARY)
-else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-set (INTL_LIBRARY "")
-endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-
-find_library (M_LIBRARY NAMES m)
-if (M_LIBRARY)
-    message (STATUS "Found M: ${M_LIBRARY}")
-else (M_LIBRARY)
-    message (FATAL_ERROR "Could NOT find M")
-endif (M_LIBRARY)
-
-set (KCOV kcov)
-
-
-# See http://eatmyrandom.blogspot.se/2010/06/automate-version-numbering-using-git.html
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    find_program (GIT_EXECUTABLE NAMES git)
-    if (GIT_EXECUTABLE)
-        message (STATUS "Found Git: ${GIT_EXECUTABLE}")
-    else (GIT_EXECUTABLE)
-        message (FATAL_ERROR "Could NOT find Git")
-    endif (GIT_EXECUTABLE)
-
-    execute_process (COMMAND "${GIT_EXECUTABLE}"
-            "--git-dir=${CMAKE_SOURCE_DIR}/.git"
-            describe
-            --abbrev=4
-            HEAD
-        OUTPUT_VARIABLE POD_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-else (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    execute_process (COMMAND head
-            -n 1
-            "${CMAKE_SOURCE_DIR}/ChangeLog"
-        COMMAND cut -d \( -f 2
-        COMMAND cut -d \) -f 1
-        OUTPUT_VARIABLE POD_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-endif (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-
-add_custom_command(
-    OUTPUT version.c
-    COMMAND "${CMAKE_COMMAND}"
-           -E echo
-           "const char *kcov_version = \\\"${POD_VERSION}\\\"\;"
-        > version.c
-)
-
-set (SOLIB kcov_sowrapper)
-
-set (${SOLIB}_SRCS
-	solib-parser/phdr_data.c
-	solib-parser/lib.c
-	)
-
-set (DISASSEMBLER_SRCS
-	parsers/dummy-disassembler.cc
-)
-
-set (HAS_LIBBFD "0")
-
-if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
-	if (LIBBFD_FOUND)
-		set (HAS_LIBBFD "1")
-		set (DISASSEMBLER_SRCS
-			parsers/bfd-disassembler.cc
-		)
-		set (DISASSEMBLER_LIBRARIES
-			${LIBBFD_OPCODES_LIBRARY}
-			${LIBBFD_BFD_LIBRARY}
-			${LIBBFD_IBERTY_LIBRARY}
-		)
-	endif (LIBBFD_FOUND)
-endif (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
-
-set (coveralls_SRCS writers/dummy-coveralls-writer.cc)
-
-if (CURL_FOUND)
-	set (coveralls_SRCS writers/coveralls-writer.cc)
-endif (CURL_FOUND)
-
-option (KCOV_STATIC_BUILD "Build a static binary" OFF)
-mark_as_advanced (KCOV_STATIC_BUILD)
-
-if (KCOV_STATIC_BUILD)
-	message (STATUS "Building a static binary (no Coveralls support)")
-
-	set (CURL_LIBRARIES "")
-	# Coveralls doesn't work in a static setting
-	set (coveralls_SRCS writers/dummy-coveralls-writer.cc)
-	set (CMAKE_EXE_LINKER_FLAGS "-static")
-endif (KCOV_STATIC_BUILD)
-
-set (ELF_SRCS
-	dummy-solib-handler.cc
-)
-set (MACHO_SRCS
-)
-set (SOLIB_generated )
-
-# Linux-specific sources
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-	find_package (LibElf)
-	find_package (Elfutils)
-	set (ELF_SRCS
-		engines/clang-coverage-engine.cc
-		engines/ptrace.cc
-		engines/ptrace_linux.cc
-		engines/kernel-engine.cc
-		parsers/elf.cc
-		parsers/elf-parser.cc
-		parsers/dwarf.cc
-		solib-handler.cc
-		solib-parser/phdr_data.c
-	)
-	set (SOLIB_generated library.cc)
-	add_library (${SOLIB} SHARED ${${SOLIB}_SRCS})
-	set_target_properties(${SOLIB} PROPERTIES SUFFIX ".so")
-	target_link_libraries(${SOLIB} dl)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-	find_package (LibElf)
-	find_package (Elfutils)
-	set (ELF_SRCS
-		engines/clang-coverage-engine.cc
-		engines/ptrace.cc
-		engines/ptrace_freebsd.cc
-		parsers/elf.cc
-		parsers/elf-parser.cc
-		parsers/dwarf.cc
-		solib-handler.cc
-		solib-parser/phdr_data.c
-	)
-	set (SOLIB_generated library.cc)
-	add_library (${SOLIB} SHARED ${${SOLIB}_SRCS})
-	set_target_properties(${SOLIB} PROPERTIES SUFFIX ".so")
-else (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-	find_library(LLDB_LIBRARY
-      NAMES
-	    LLDB
-	  PATHS
-        "/usr/lib"
-        "/usr/lib64"
-        "/usr/local/lib"
-        "/usr/local/lib64"
-        "/opt/local/lib"
-        "/opt/usr/lib64"
-		"/Library/Developer/CommandLineTools/Library/PrivateFrameworks"
-		"/Applications/Xcode.app/Contents/SharedFrameworks"
-		ENV LIBRARY_PATH
-		ENV LD_LIBRARY_PATH
-	)
-	mark_as_advanced(LLDB_LIBRARY)
-	if(LLDB_LIBRARY)
-	  message (STATUS "Found LLDB: ${LLDB_LIBRARY}")
-	endif()
-
-	# Not really true, but anyway
-	set(LIBELF_FOUND 1)
-
-	set (MACHO_SRCS
-		engines/lldb-engine.cc
-	)
-endif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-set (${KCOV}_SRCS
-    capabilities.cc
-    collector.cc
-    configuration.cc
-    engine-factory.cc
-    engines/bash-engine.cc
-    engines/system-mode-engine.cc
-    engines/system-mode-file-format.cc
-    engines/python-engine.cc
-    filter.cc
-    gcov.cc
-    main.cc
-    merge-file-parser.cc
-    output-handler.cc
-    ${DISASSEMBLER_SRCS}
-    parser-manager.cc
-    reporter.cc
-    source-file-cache.cc
-    utils.cc
-    writers/cobertura-writer.cc
-    writers/json-writer.cc
-    ${coveralls_SRCS}
-    writers/html-writer.cc
-    writers/sonarqube-xml-writer.cc
-    writers/writer-base.cc
-    ${ELF_SRCS}
-    ${MACHO_SRCS}
-    include/capabilities.hh
-    include/gcov.hh
-    include/reporter.hh
-    include/collector.hh
-    include/generated-data-base.hh
-    include/solib-handler.hh
-    include/configuration.hh
-    include/lineid.hh
-    include/swap-endian.hh
-    include/engine.hh
-    include/manager.hh
-    include/utils.hh
-    include/file-parser.hh
-    include/output-handler.hh
-    include/writer.hh
-    include/filter.hh
-    include/phdr_data.h
-    system-mode/file-data.cc
-    )
-
-set (KCOV_SYSTEM_MODE_SRCS
-    configuration.cc
-	dummy-solib-handler.cc
-    engine-factory.cc
-    engines/system-mode-file-format.cc
-    engines/ptrace.cc
-    engines/ptrace_linux.cc
-    filter.cc
-    gcov.cc
-    include/capabilities.hh
-    include/collector.hh
-    include/configuration.hh
-    include/engine.hh
-    include/file-parser.hh
-    include/filter.hh
-    include/gcov.hh
-    include/generated-data-base.hh
-    include/lineid.hh
-    include/manager.hh
-    include/output-handler.hh
-    include/phdr_data.h
-    include/reporter.hh
-    include/solib-handler.hh
-    include/swap-endian.hh
-    include/utils.hh
-    include/writer.hh
-    main-system-daemon.cc
-    parser-manager.cc
-	system-mode/file-data.cc
-	system-mode/registration.cc
-    utils.cc
-)
-
-set (KCOV_LIBRARY_PREFIX "/tmp")
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD}")
-
-include_directories(
-	include/
-	../external/lldb/include/
-	${ZLIB_INCLUDE_DIR}
-	)
-
-if (LIBDW_FOUND)
-    include_directories(${LIBDW_INCLUDE_DIRS})
-endif (LIBDW_FOUND)
-
-if (LIBELF_FOUND)
-    include_directories(${LIBELF_INCLUDE_DIRS})
-endif (LIBELF_FOUND)
-
-if (CURL_FOUND)
-    include_directories(${CURL_INCLUDE_DIRS})
-endif (CURL_FOUND)
-
-add_library (bash_execve_redirector SHARED engines/bash-execve-redirector.c)
-set_target_properties(bash_execve_redirector PROPERTIES SUFFIX ".so")
-target_link_libraries(bash_execve_redirector ${DL_LIBRARY})
-
-add_library (kcov_system_lib SHARED engines/system-mode-binary-lib.cc utils.cc system-mode/registration.cc)
-set_target_properties(kcov_system_lib PROPERTIES SUFFIX ".so")
-target_link_libraries(kcov_system_lib
-    "${DL_LIBRARY}"
-)
-
-
-add_custom_command(
-    OUTPUT library.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            lib${SOLIB}.so
-            __library
-        > library.cc
-    DEPENDS
-        ${SOLIB}
-        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-add_custom_command(
-    OUTPUT bash-redirector-library.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            $<TARGET_FILE:bash_execve_redirector>
-            bash_redirector_library
-        > bash-redirector-library.cc
-    DEPENDS
-        bash_execve_redirector
-        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-add_custom_command(
-    OUTPUT kcov-system-library.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            $<TARGET_FILE:kcov_system_lib>
-            kcov_system_library
-        > kcov-system-library.cc
-    DEPENDS
-        kcov_system_lib
-       "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-add_custom_command(
-    OUTPUT python-helper.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            "${CMAKE_CURRENT_SOURCE_DIR}/engines/python-helper.py"
-            python_helper
-        > python-helper.cc
-    DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/engines/python-helper.py"
-        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-add_custom_command(
-    OUTPUT bash-helper.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper.sh"
-            bash_helper
-            "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper-debug-trap.sh"
-            bash_helper_debug_trap
-        > bash-helper.cc
-    DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper.sh"
-        "${CMAKE_CURRENT_SOURCE_DIR}/engines/bash-helper-debug-trap.sh"
-        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-add_custom_command(
-    OUTPUT html-data-files.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/bcov.css" css_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/amber.png" icon_amber
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/glass.png" icon_glass
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/source-file.html" source_file_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/index.html" index_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/handlebars.js" handlebars_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/kcov.js" kcov_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.min.js" jquery_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.min.js" tablesorter_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.widgets.min.js" tablesorter_widgets_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../data/tablesorter-theme.css" tablesorter_theme_text
-        > html-data-files.cc
-    DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/bcov.css"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/amber.png"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/glass.png"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/source-file.html"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/index.html"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/handlebars.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/kcov.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/js/jquery.tablesorter.widgets.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../data/tablesorter-theme.css"
-        "${CMAKE_CURRENT_SOURCE_DIR}/bin-to-c-source.py"
-)
-
-# Reference: http://www.cmake.org/Wiki/CMake_RPATH_handling
-if (SPECIFY_RPATH)
-	set (CMAKE_SKIP_BUILD_RPATH OFF)
-	set (CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
-	set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
-	# the RPATH to be used when installing, but only if it's not a system directory
-	list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" IS_SYSTEM_DIR)
-	if (IS_SYSTEM_DIR EQUAL -1)
-	    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-	endif (IS_SYSTEM_DIR EQUAL -1)
-endif (SPECIFY_RPATH)
-
-if (LIBELF_FOUND)
-	add_executable (${KCOV} ${${KCOV}_SRCS} ${SOLIB_generated} bash-redirector-library.cc python-helper.cc bash-helper.cc kcov-system-library.cc html-data-files.cc version.c)
-
-	target_link_libraries(${KCOV}
-		stdc++
-		${CMAKE_THREAD_LIBS_INIT}
-		${CURL_LIBRARIES}
-		"${DL_LIBRARY}"
-		"${INTL_LIBRARY}"
-		${DISASSEMBLER_LIBRARIES}
-		${LIBDW_LIBRARIES}
-		${LIBELF_LIBRARIES}
-		${LLDB_LIBRARY}
-		"${M_LIBRARY}"
-		${ZLIB_LIBRARIES}
-	)
-	install (TARGETS ${KCOV} DESTINATION "${KCOV_INSTALL_BINDIR}")
-endif (LIBELF_FOUND)
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    add_executable (kcov-system-daemon ${KCOV_SYSTEM_MODE_SRCS} version.c)
-
-    target_link_libraries(kcov-system-daemon
-        stdc++
-        ${CMAKE_THREAD_LIBS_INIT}
-        "${DL_LIBRARY}"
-        "${M_LIBRARY}"
-        ${ZLIB_LIBRARIES}
-	)
-	install (TARGETS kcov-system-daemon DESTINATION "${KCOV_INSTALL_BINDIR}")
-endif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    get_filename_component(LLDB_LIBRARY_NAME "${LLDB_LIBRARY}" NAME)
-    if(LLDB_LIBRARY_NAME STREQUAL "LLDB.framework")
-      set(LLDB_LIBRARY_INSTALL_NAME "${LLDB_LIBRARY}/Versions/Current/LLDB")
-	  add_custom_command(TARGET ${KCOV}
-        POST_BUILD COMMAND
-        "${CMAKE_INSTALL_NAME_TOOL}" -change @rpath/LLDB.framework/LLDB "${LLDB_LIBRARY_INSTALL_NAME}" $<TARGET_FILE:${KCOV}>
-        COMMENT "Changing LLDB install name from @rpath/LLDB.framework/LLDB to ${LLDB_LIBRARY_INSTALL_NAME}")
-	endif()
-endif()
-
-# uninstall target
-if(NOT TARGET uninstall)
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-        IMMEDIATE @ONLY)
-
-    add_custom_target(uninstall
-        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif()
diff --git a/kcov-38/src/bin-to-c-source.py b/kcov-38/src/bin-to-c-source.py
deleted file mode 100755
index f46cf1d201a2..000000000000
--- a/kcov-38/src/bin-to-c-source.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-import sys, struct
-
-def generate(data_in, base_name):
-	print("const uint8_t %s_data_raw[] = {" % (base_name))
-
-	for i in range(0, len(data), 20):
-		line = bytearray(data[i:i+20])
-
-		for val in line:
-			print("0x%02x," % (val), end="")
-		print("")
-
-	print("};")
-	print("GeneratedData %s_data(%s_data_raw, sizeof(%s_data_raw));" % (base_name, base_name, base_name))
-
-if __name__ == "__main__":
-	if len(sys.argv) < 3 or (len(sys.argv) - 1) % 2 != 0:
-		print("Usage: bin-to-source.py <file> <base-name> [<file2> <base-name2>]")
-		sys.exit(1)
-
-	print("#include <stdint.h>")
-	print("#include <stdlib.h>")
-	print("#include <generated-data-base.hh>")
-	print("using namespace kcov;")
-
-	for i in range(1,len(sys.argv), 2):
-		file = sys.argv[i]
-		base_name = sys.argv[i + 1]
-
-		f = open(file, "rb")
-		data = f.read()
-		f.close()
-
-		generate(data, base_name)
diff --git a/kcov-38/src/capabilities.cc b/kcov-38/src/capabilities.cc
deleted file mode 100644
index b6fd3c4b521c..000000000000
--- a/kcov-38/src/capabilities.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <capabilities.hh>
-#include <utils.hh>
-
-#include <unordered_map>
-
-using namespace kcov;
-
-class Capabilities : public ICapabilities
-{
-public:
-	Capabilities()
-	{
-		m_capabilities["handle-solibs"] = false;
-	}
-
-	void addCapability(const std::string &name)
-	{
-		validateCapability(name);
-		m_capabilities[name] = true;
-	}
-
-	void removeCapability(const std::string &name)
-	{
-		validateCapability(name);
-		m_capabilities[name] = false;
-	}
-
-	bool hasCapability(const std::string &name)
-	{
-		validateCapability(name);
-
-		return m_capabilities[name];
-	}
-
-private:
-	void validateCapability(const std::string &name)
-	{
-		panic_if(m_capabilities.find(name) == m_capabilities.end(),
-				"Capability %s not present", name.c_str());
-	}
-
-	std::unordered_map<std::string, bool> m_capabilities;
-};
-
-static Capabilities g_capabilities;
-ICapabilities &ICapabilities::getInstance()
-{
-	return g_capabilities;
-}
diff --git a/kcov-38/src/cmake_uninstall.cmake.in b/kcov-38/src/cmake_uninstall.cmake.in
deleted file mode 100644
index 4457d1bd712a..000000000000
--- a/kcov-38/src/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,21 +0,0 @@
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    exec_program(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    if(NOT "${rm_retval}" STREQUAL 0)
-      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-    endif(NOT "${rm_retval}" STREQUAL 0)
-  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-endforeach(file)
\ No newline at end of file
diff --git a/kcov-38/src/collector.cc b/kcov-38/src/collector.cc
deleted file mode 100644
index 4d94b98244bf..000000000000
--- a/kcov-38/src/collector.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-#include <collector.hh>
-#include <file-parser.hh>
-#include <utils.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <filter.hh>
-#include <signal.h>
-
-#include <unordered_map>
-#include <string>
-#include <vector>
-
-using namespace kcov;
-
-class Collector : public ICollector,
-		public IFileParser::ILineListener,
-		public IEngine::IEventListener
-{
-public:
-	Collector(IFileParser &fileParser, IEngine &engine, IFilter &filter) :
-			m_fileParser(fileParser), m_engine(engine), m_exitCode(-1), m_filter(
-					filter)
-	{
-		m_fileParser.registerLineListener(*this);
-	}
-
-	void registerListener(ICollector::IListener &listener)
-	{
-		m_listeners.push_back(&listener);
-	}
-
-	void registerEventTickListener(IEventTickListener &listener)
-	{
-		m_eventTickListeners.push_back(&listener);
-	}
-
-	int run(const std::string &filename)
-	{
-		if (!m_engine.start(*this, filename))
-		{
-			error("Can't start/attach to %s", filename.c_str());
-			return -1;
-		}
-
-		// This will set all breakpoints
-		m_fileParser.parse();
-
-		while (1)
-		{
-			bool shouldContinue = m_engine.continueExecution();
-
-			tick();
-
-			if (!shouldContinue)
-				break;
-		}
-
-		return m_exitCode;
-	}
-
-	virtual void stop()
-	{
-	}
-
-private:
-	void tick()
-	{
-		for (EventTickListenerList_t::iterator it =
-				m_eventTickListeners.begin(); it != m_eventTickListeners.end();
-				++it)
-			(*it)->onTick();
-	}
-
-	std::string eventToName(IEngine::Event ev)
-	{
-		switch (ev.type)
-		{
-		case ev_breakpoint:
-			return fmt("breakpoint at 0x%llx", (unsigned long long) ev.addr);
-		case ev_exit:
-			return fmt("exit code %d", ev.data);
-		case ev_signal:
-		case ev_signal_exit:
-		{
-			if (ev.data == SIGABRT)
-				return std::string("SIGABRT");
-			if (ev.data == SIGSEGV)
-				return std::string("SIGSEGV");
-			if (ev.data == SIGILL)
-				return std::string("SIGILL");
-			if (ev.data == SIGTERM)
-				return std::string("SIGTERM");
-			if (ev.data == SIGINT)
-				return std::string("SIGINT");
-			if (ev.data == SIGBUS)
-				return std::string("SIGBUS");
-			if (ev.data == SIGFPE)
-				return std::string("SIGFPE");
-
-			return fmt("unknown signal %d", ev.data);
-		}
-		case ev_error:
-			return std::string("error");
-		default:
-			break;
-		}
-
-		return std::string("unknown");
-	}
-
-	// From IEngine
-	void onEvent(const IEngine::Event &ev)
-	{
-		switch (ev.type)
-		{
-		case ev_error:
-			break;
-		case ev_signal:
-			break;
-		case ev_signal_exit:
-			kcov_debug(STATUS_MSG,
-					"kcov: Process exited with signal %d (%s) at 0x%llx\n",
-					ev.data, eventToName(ev).c_str(),
-					(unsigned long long) ev.addr);
-
-			if (ev.data == SIGILL)
-				kcov_debug(STATUS_MSG,
-						"\nkcov: Illegal instructions are sometimes caused by some GCC versions\n"
-								"kcov: miscompiling C++ headers. If the problem is persistent, try running\n"
-								"kcov: with --verify. For more information, see\n"
-								"kcov: http://github.com/SimonKagstrom/kcov/issues/18\n"
-#if KCOV_HAS_LIBBFD == 0
-						"\n"
-						"kcov: WARNING: kcov has been built without libbfd-dev (or\n"
-						"kcov: binutils-dev), so the --verify option will not do anything."
-#endif
-						);
-
-			break;
-
-		case ev_exit_first_process:
-			if (IConfiguration::getInstance().keyAsInt(
-					"daemonize-on-first-process-exit"))
-			{
-				IConfiguration &conf = IConfiguration::getInstance();
-				std::string fifoName = conf.keyAsString("target-directory")
-						+ "/done.fifo";
-
-				std::string exitCode = fmt("%u", ev.data);
-
-				write_file(exitCode.c_str(), exitCode.size(), "%s",
-						fifoName.c_str());
-			}
-			m_exitCode = ev.data;
-			break;
-		case ev_exit:
-			m_exitCode = ev.data;
-			break;
-		case ev_breakpoint:
-			for (ListenerList_t::const_iterator it = m_listeners.begin();
-					it != m_listeners.end(); ++it)
-				(*it)->onAddressHit(ev.addr, 1);
-
-			break;
-
-		default:
-			panic("Unknown event %d", ev.type);
-		}
-	}
-
-	// From IFileParser
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-		if (!m_filter.runFilters(file))
-		{
-			return;
-		}
-
-		m_engine.registerBreakpoint(addr);
-	}
-
-	typedef std::vector<ICollector::IListener *> ListenerList_t;
-	typedef std::vector<ICollector::IEventTickListener *> EventTickListenerList_t;
-
-	IFileParser &m_fileParser;
-	IEngine &m_engine;
-	ListenerList_t m_listeners;
-	EventTickListenerList_t m_eventTickListeners;
-	int m_exitCode;
-
-	IFilter &m_filter;
-};
-
-ICollector &ICollector::create(IFileParser &elf, IEngine &engine,
-		IFilter &filter)
-{
-	return *new Collector(elf, engine, filter);
-}
diff --git a/kcov-38/src/configuration.cc b/kcov-38/src/configuration.cc
deleted file mode 100644
index 90f3805b5922..000000000000
--- a/kcov-38/src/configuration.cc
+++ /dev/null
@@ -1,809 +0,0 @@
-#include <configuration.hh>
-#include <file-parser.hh>
-#include <utils.hh>
-#include <stdlib.h>
-#include <getopt.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <map>
-#include <list>
-#include <string>
-#include <stdexcept>
-#include <unordered_map>
-#include <iostream>
-using namespace kcov;
-
-extern "C" const char *kcov_version;
-
-class Configuration : public IConfiguration
-{
-public:
-	Configuration()
-	{
-		m_programArgs = NULL;
-		m_argc = 0;
-		m_printUncommon = false;
-
-		setupDefaults();
-	}
-
-	const std::string &keyAsString(const std::string &key)
-	{
-		panic_if(m_strings.find(key) == m_strings.end(), "key %s not found",
-				key.c_str());
-
-		return m_strings[key];
-	}
-
-	int keyAsInt(const std::string &key)
-	{
-		panic_if(m_ints.find(key) == m_ints.end(), "key %s not found",
-				key.c_str());
-
-		return m_ints[key];
-	}
-
-	const std::vector<std::string> &keyAsList(const std::string &key)
-	{
-		panic_if(m_stringVectors.find(key) == m_stringVectors.end(),
-				"key %s not found", key.c_str());
-
-		return m_stringVectors[key];
-	}
-
-	bool usage(void)
-	{
-		printf(
-				"Usage: kcov [OPTIONS] out-dir in-file [args...]\n"
-						"\n"
-						"Where [OPTIONS] are\n"
-						" -h, --help              this text\n"
-						" --version               print the version of kcov\n"
-						" -p, --pid=PID           trace PID instead of executing in-file,\n"
-						"                         in-file is optional on Linux in this case\n"
-						" -l, --limits=low,high   setup limits for low/high coverage (default %u,%u)\n"
-						"\n"
-						" --collect-only          Only collect coverage data (don't produce HTML/\n"
-						"                         Cobertura output)\n"
-						" --report-only           Produce output from stored databases, don't collect\n"
-						" --merge                 Merge output from multiple source dirs\n"
-						"\n"
-						" --include-path=path     comma-separated paths to include in the coverage report\n"
-						" --exclude-path=path     comma-separated paths to exclude from the coverage\n"
-						"                         report\n"
-						" --include-pattern=pat   comma-separated path patterns to include in the\n"
-						"                         coverage report\n"
-						" --exclude-pattern=pat   comma-separated path patterns to exclude from the \n"
-						"                         coverage report\n"
-						" --exclude-line=pat[,...] Consider lines that match the patterns to be non-\n"
-						"                         code lines.\n"
-						" --exclude-region=start:stop[,...] Exclude regions of code between start:stop\n"
-						"                         markers (e.g., within comments) as non-code lines.\n"
-						" --clean                 don't accumulate data from multiple runs\n"
-						"\n"
-						" --coveralls-id=id       Travis CI job ID or secret repo_token for uploads to\n"
-						"                         Coveralls.io\n"
-						" --strip-path=path       If not set, max common path will be stripped away.\n"
-						"%s"
-						"\n"
-						"Examples:\n"
-						"  kcov /tmp/kcov ./frodo                        # Check coverage for ./frodo\n"
-						"  kcov --pid=1000 /tmp/kcov                     # Check coverage for PID 1000\n"
-						"  kcov --include-pattern=/src/frodo/ /tmp/kcov ./frodo # Only include files\n"
-						"                                                       # including /src/frodo\n"
-						"  kcov --collect-only /tmp/kcov ./frodo  # Collect coverage, don't report\n"
-						"  kcov --report-only /tmp/kcov ./frodo   # Report coverage collected above\n"
-						"  kcov --merge /tmp/out /tmp/dir1 /tmp/dir2     # Merge the dir1/dir2 reports\n"
-						"  kcov --system-record /tmp/out-dir sysroot     # Perform full-system in-\n"
-						"                                                  strumentation for sysroot\n"
-						"  kcov --system-report  /tmp/data-dir           # Report all data from a full-\n"
-						"                                                  system run.\n"
-						"", keyAsInt("low-limit"), keyAsInt("high-limit"),
-				uncommonOptions().c_str());
-
-		return false;
-	}
-
-	void printUsage()
-	{
-		usage();
-	}
-
-	bool parse(unsigned int argc, const char *argv[])
-	{
-		static const struct option long_options[] =
-		{
-		{ "help", no_argument, 0, 'h' },
-		{ "pid", required_argument, 0, 'p' },
-		{ "limits", required_argument, 0, 'l' },
-		{ "output-interval", required_argument, 0, 'O' },
-		{ "path-strip-level", required_argument, 0, 'S' },
-		{ "skip-solibs", no_argument, 0, 'L' },
-		{ "exit-first-process", no_argument, 0, 'F' },
-		{ "gcov", no_argument, 0, 'g' },
-		{ "clang", no_argument, 0, 'c' },
-		{ "configure", required_argument, 0, 'M' },
-		{ "clean", no_argument, 0, 'E' },
-		{ "exclude-pattern", required_argument, 0, 'x' },
-		{ "include-pattern", required_argument, 0, 'i' },
-		{ "exclude-path", required_argument, 0, 'X' },
-		{ "include-path", required_argument, 0, 'I' },
-		{ "coveralls-id", required_argument, 0, 'T' },
-		{ "strip-path", required_argument, 0, 'Z' },
-		{ "exclude-line", required_argument, 0, 'u' },
-		{ "exclude-region", required_argument, 0, 'G' },
-		{ "debug", required_argument, 0, 'D' },
-		{ "debug-force-bash-stderr", no_argument, 0, 'd' },
-		{ "bash-handle-sh-invocation", no_argument, 0, 's' },
-		{ "bash-dont-parse-binary-dir", no_argument, 0, 'j' },
-		{ "bash-parse-files-in-dirs", required_argument, 0, 'J' },
-		{ "replace-src-path", required_argument, 0, 'R' },
-		{ "collect-only", no_argument, 0, 'C' },
-		{ "report-only", no_argument, 0, 'r' },
-		{ "merge", no_argument, 0, 'm' },
-		{ "python-parser", required_argument, 0, 'P' },
-		{ "patchelf", required_argument, 0, 'e' },
-		{ "bash-parser", required_argument, 0, 'B' },
-		{ "bash-method", required_argument, 0, '4' },
-		{ "system-record", no_argument, 0, '8' },
-		{ "system-report", no_argument, 0, '9' },
-		{ "verify", no_argument, 0, 'V' },
-		{ "version", no_argument, 0, 'v' },
-		{ "uncommon-options", no_argument, 0, 'U' },
-		/*{"write-file", required_argument, 0, 'w'}, Take back when the kernel stuff works */
-		/*{"read-file", required_argument, 0, 'r'}, Ditto */
-		{ 0, 0, 0, 0 } };
-		unsigned int afterOpts = 0;
-		unsigned int extraNeeded = 2;
-		unsigned int lastArg;
-
-		setupDefaults();
-
-		const char *path = getenv("PATH");
-
-		if (!path)
-			path = "";
-
-		std::vector<std::string> paths = split_string(path, ":");
-
-		/* Scan through the parameters for an ELF file: That will be the
-		 * second last argument in the list.
-		 *
-		 * After that it's arguments to the external program.
-		 */
-		for (lastArg = 1; lastArg < argc; lastArg++)
-		{
-			if (IParserManager::getInstance().matchParser(argv[lastArg]))
-				break;
-
-			bool found = false;
-			for (std::vector<std::string>::const_iterator it = paths.begin();
-					it != paths.end(); ++it)
-			{
-				const std::string &curPath = *it;
-				const std::string cur = get_real_path(
-						curPath + "/" + argv[lastArg]);
-				struct stat st;
-
-				if (lstat(cur.c_str(), &st) < 0)
-					continue;
-
-				// Regular file?
-				if (S_ISREG(st.st_mode) == 0)
-					continue;
-
-				// Executable?
-				if ((st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)
-					continue;
-
-				if (IParserManager::getInstance().matchParser(cur))
-				{
-					// Intentional memory leak
-					argv[lastArg] = xstrdup(cur.c_str());
-					found = true;
-					break;
-				}
-			}
-
-			if (found)
-				break;
-		}
-
-		bool printUsage = false;
-
-		/* Hooray for reentrancy... */
-		optind = 0;
-		optarg = 0;
-		while (1)
-		{
-			int option_index = 0;
-			int c;
-
-			c = getopt_long(lastArg, (char **) argv, "hp:s:l:t:", long_options,
-					&option_index);
-
-			/* No more options */
-			if (c == -1)
-				break;
-
-			switch (c)
-			{
-			case 0:
-				break;
-			case 'h':
-				printUsage = true;
-				break;
-			case 'U':
-				m_printUncommon = true;
-				break;
-			case 'V':
-				setKey("verify", 1);
-#if KCOV_HAS_LIBBFD == 0
-				warning(
-						"kcov: WARNING: kcov has been built without libbfd-dev (or\n"
-								"kcov: binutils-dev), so the --verify option will not do anything.\n");
-#endif
-				break;
-			case 'v':
-				printf("kcov %s\n", kcov_version);
-				exit(0);
-				break;
-			case 'L':
-				setKey("parse-solibs", 0);
-				break;
-			case 'F':
-				setKey("daemonize-on-first-process-exit", 1);
-				break;
-			case 'g':
-				setKey("gcov", 1);
-				break;
-			case 'c':
-				setKey("clang-sanitizer", 1);
-				break;
-			case 'E':
-				setKey("clean-output", 1);
-				break;
-			case 'p':
-			{
-				if (!isInteger(std::string(optarg)))
-					return usage();
-
-				unsigned long pid = stoul(std::string(optarg));
-				setKey("attach-pid", pid);
-
-				// Linux can derive this from /proc
-				if (file_exists(fmt("/proc/%lu/exe", pid)))
-				{
-					extraNeeded = 1;
-				}
-				break;
-			}
-			case 'O':
-				if (!isInteger(std::string(optarg)))
-					return usage();
-
-				setKey("output-interval", stoul(std::string(optarg)));
-				break;
-			case 'S':
-			{
-				if (!isInteger(std::string(optarg)))
-					return usage();
-
-				int pathStripLevel = stoul(std::string(optarg));
-				if (pathStripLevel == 0)
-					pathStripLevel = INT_MAX;
-				setKey("path-strip-level", pathStripLevel);
-				break;
-			}
-			case 'D':
-				if (!isInteger(std::string(optarg)))
-					return usage();
-				g_kcov_debug_mask = stoul(std::string(optarg));
-				break;
-			case 'M':
-			{
-				std::vector<std::string> values = split_string(optarg, ",");
-
-				for (std::vector<std::string>::const_iterator it =
-						values.begin(); it != values.end(); ++it)
-				{
-					std::vector<std::string> keyValue = split_string(*it, "=");
-
-					if (keyValue.size() != 2)
-					{
-						error("--configure needs key=value pairs\n");
-						return usage();
-					}
-
-					configure(keyValue[0], keyValue[1]);
-				}
-
-				break;
-			}
-			case 'i':
-				setKey("include-pattern",
-						getCommaSeparatedList(std::string(optarg)));
-				break;
-			case 'P':
-				setKey("python-command", optarg);
-				break;
-			case 'e':
-				setKey("patchelf-command", optarg);
-				break;
-			case 'B':
-				setKey("bash-command", optarg);
-				break;
-			case 'T':
-				setKey("coveralls-id", optarg);
-				break;
-			case 'Z':
-				setKey("strip-path", std::string(optarg));
-				break;
-			case 'u':
-				setKey("exclude-line", std::string(optarg));
-				break;
-			case 'G':
-				setKey("exclude-region", std::string(optarg));
-				break;
-			case 'x':
-				setKey("exclude-pattern",
-						getCommaSeparatedList(std::string(optarg)));
-				break;
-			case 'I':
-			{
-				StrVecMap_t onlyIncludePath = getCommaSeparatedList(
-						std::string(optarg));
-				expandPath(onlyIncludePath);
-
-				setKey("include-path", onlyIncludePath);
-				break;
-			}
-			case 'X':
-			{
-				StrVecMap_t excludePath = getCommaSeparatedList(
-						std::string(optarg));
-				expandPath(excludePath);
-
-				setKey("exclude-path", excludePath);
-				break;
-			}
-			case 'd':
-				setKey("bash-force-stderr-input", 1);
-				setKey("bash-use-ps4", 1); // Needed in this mode
-				break;
-			case 's':
-				setKey("bash-handle-sh-invocation", 1);
-				break;
-			case '4':
-			{
-				std::string s(optarg);
-
-				if (s == "DEBUG")
-					setKey("bash-use-ps4", 0);
-				else if (s == "PS4")
-					setKey("bash-use-ps4", 1);
-				else
-					panic("Invalid bash method: Use PS4 or DEBUG\n");
-			}
-				break;
-			case 'C':
-				setKey("running-mode", IConfiguration::MODE_COLLECT_ONLY);
-				break;
-			case 'r':
-				setKey("running-mode", IConfiguration::MODE_REPORT_ONLY);
-				break;
-			case 'm':
-				setKey("running-mode", IConfiguration::MODE_MERGE_ONLY);
-				break;
-			case '8': // Full system record
-				setKey("running-mode", IConfiguration::MODE_SYSTEM_RECORD);
-				setKey("parse-solibs", 0); // Not applicable
-				break;
-			case '9': // Full system report
-				setKey("running-mode", IConfiguration::MODE_SYSTEM_REPORT);
-				setKey("parse-solibs", 0);
-				break;
-			case 'l':
-			{
-				StrVecMap_t vec = getCommaSeparatedList(std::string(optarg));
-
-				if (vec.size() != 2)
-					return usage();
-
-				if (!isInteger(vec[0]) || !isInteger(vec[1]))
-					return usage();
-
-				setKey("low-limit", stoul(vec[0]));
-				setKey("high-limit", stoul(vec[1]));
-				break;
-			}
-			case 'j':
-				setKey("bash-parse-binary-dir", 0);
-				break;
-			case 'J':
-			{
-				StrVecMap_t bashFilesInPath = getCommaSeparatedList(
-						std::string(optarg));
-
-				setKey("bash-parse-file-dir", bashFilesInPath);
-				break;
-			}
-			case 'R':
-			{
-				std::string tmpArg = std::string(optarg);
-				size_t tokenPosFront = tmpArg.find_first_of(":");
-				size_t tokenPosBack = tmpArg.find_last_of(":");
-
-				if ((tokenPosFront != std::string::npos)
-						&& (tokenPosFront == tokenPosBack))
-				{
-
-					std::string originalPathPrefix = tmpArg.substr(0,
-							tokenPosFront);
-					std::string newPathPrefix = tmpArg.substr(
-							tokenPosFront + 1);
-
-					char* rp = ::realpath(newPathPrefix.c_str(), NULL);
-					if (rp)
-					{
-						free((void*) rp);
-					}
-					else
-					{
-						panic("%s is not a valid path.\n",
-								newPathPrefix.c_str());
-					}
-
-					setKey("orig-path-prefix", originalPathPrefix);
-					setKey("new-path-prefix", newPathPrefix);
-				}
-				else
-				{
-					panic("%s is formatted incorrectly\n", tmpArg.c_str());
-
-				}
-				break;
-			}
-			default:
-				error("Unrecognized option: -%c\n", optopt);
-				return usage();
-			}
-		}
-
-		if (printUsage)
-			return usage();
-
-		afterOpts = optind;
-
-		/* When tracing by PID, the filename is optional */
-		if (argc < afterOpts + extraNeeded)
-			return usage();
-
-		std::string outDirectory = argv[afterOpts];
-		if (outDirectory[outDirectory.size() - 1] != '/')
-			outDirectory += "/";
-
-		setKey("out-directory", outDirectory);
-		if (keyAsInt("running-mode") == IConfiguration::MODE_MERGE_ONLY)
-		{
-			// argv contains the directories to merge in this case, but we have no binary name etc
-			setKey("binary-name", "merged-kcov-output");
-			setKey("target-directory", outDirectory + "/merged-kcov-output");
-		}
-		else
-		{
-			std::string binaryName;
-			std::string path;
-
-			if (keyAsInt("attach-pid") == 0)
-			{
-				path = argv[afterOpts + 1];
-			}
-			else
-			{
-				// Trace by PID - derive from /proc/$pid/exe on Linux
-				int pid = keyAsInt("attach-pid");
-				path = get_real_path(fmt("/proc/%d/exe", pid));
-
-				if (!file_exists(path))
-				{
-					if (argc < afterOpts + 1)
-						usage();
-					path = argv[afterOpts + 1];
-				}
-			}
-
-			path = get_real_path(path);
-			std::pair<std::string, std::string> tmp = split_path(path);
-
-			setKey("binary-path", tmp.first);
-			binaryName = tmp.second;
-
-			setKey("target-directory",
-					fmt("%s/%s.%08zx", outDirectory.c_str(), binaryName.c_str(),
-							std::hash<std::string>()(tmp.first)));
-
-			setKey("binary-name", binaryName);
-
-			if (keyAsString("command-name") == "")
-				setKey("command-name", binaryName);
-		}
-
-		m_programArgs = &argv[afterOpts + 1];
-		m_argc = argc - afterOpts - 1;
-
-		return true;
-	}
-
-	const char **getArgv()
-	{
-		return m_programArgs;
-	}
-
-	unsigned int getArgc()
-	{
-		return m_argc;
-	}
-
-	void registerListener(IListener &listener,
-			const std::vector<std::string> &keys)
-	{
-		for (std::vector<std::string>::const_iterator it = keys.begin();
-				it != keys.end(); ++it)
-			m_listeners[*it] = &listener;
-	}
-
-	// "private", but we ignore that in the unit test
-	typedef std::vector<std::string> StrVecMap_t;
-
-	typedef std::unordered_map<std::string, std::string> StringKeyMap_t;
-	typedef std::unordered_map<std::string, int> IntKeyMap_t;
-	typedef std::unordered_map<std::string, StrVecMap_t> StrVecKeyMap_t;
-
-	typedef std::unordered_map<std::string, IListener *> ListenerMap_t;
-
-	// Setup the default key:value pairs
-	void setupDefaults()
-	{
-		setKey("binary-path", "");
-		setKey("python-command", "python");
-#ifdef __FreeBSD__
-		setKey("bash-command", "/usr/local/bin/bash");
-#else
-		setKey("bash-command", "/bin/bash");
-#endif
-		setKey("kernel-coverage-path", "/sys/kernel/debug/kprobe-coverage");
-		setKey("path-strip-level", 2);
-		setKey("attach-pid", 0);
-		setKey("parse-solibs", 1);
-		setKey("gcov", 0);
-		setKey("clang-sanitizer", 0);
-		setKey("clean-output", 0);
-		setKey("low-limit", 25);
-		setKey("high-limit", 75);
-		setKey("output-interval", 5000);
-		setKey("daemonize-on-first-process-exit", 0);
-		setKey("coveralls-id", "");
-		setKey("strip-path", "");
-		setKey("exclude-line", "");
-		setKey("exclude-region", "");
-		setKey("orig-path-prefix", "");
-		setKey("new-path-prefix", "");
-		setKey("running-mode", IConfiguration::MODE_COLLECT_AND_REPORT);
-		setKey("exclude-pattern", StrVecMap_t());
-		setKey("include-pattern", StrVecMap_t());
-		setKey("exclude-path", StrVecMap_t());
-		setKey("include-path", StrVecMap_t());
-		setKey("bash-force-stderr-input", 0);
-		setKey("bash-handle-sh-invocation", 0);
-		setKey("bash-use-basic-parser", 0);
-		setKey("bash-use-ps4", 1);
-		setKey("bash-parse-file-dir", StrVecMap_t());
-		setKey("bash-parse-binary-dir", 1);
-		setKey("verify", 0);
-		setKey("command-name", "");
-		setKey("merged-name", "[merged]");
-		setKey("css-file", "");
-		setKey("lldb-use-raw-breakpoint-writes", 0);
-		setKey("system-mode-write-file", "");
-		setKey("system-mode-write-file-mode", 0644);
-		setKey("system-mode-read-results-file", "");
-		setKey("patchelf-command", "patchelf");
-		setKey("coveralls-service-name", "travis-ci");
-	}
-
-	void setKey(const std::string &key, const std::string &val)
-	{
-		m_strings[key] = val;
-
-		notifyKeyListeners(key);
-	}
-
-	void setKey(const std::string &key, int val)
-	{
-		m_ints[key] = val;
-
-		notifyKeyListeners(key);
-	}
-
-	void setKey(const std::string &key, const std::vector<std::string> &val)
-	{
-		m_stringVectors[key] = val;
-
-		notifyKeyListeners(key);
-	}
-
-	void notifyKeyListeners(const std::string &key)
-	{
-		ListenerMap_t::iterator it = m_listeners.find(key);
-
-		if (it == m_listeners.end())
-			return;
-
-		// The callback should re-read the configuration item
-		it->second->onConfigurationChanged(key);
-	}
-
-	void configure(const std::string &key, const std::string &value)
-	{
-		if (key == "low-limit" || key == "high-limit"
-				|| key == "bash-use-basic-parser")
-		{
-			if (!isInteger(value))
-				panic("Value for %s must be integer\n", key.c_str());
-		}
-
-		if (key == "low-limit")
-			setKey(key, stoul(std::string(value)));
-		else if (key == "high-limit")
-			setKey(key, stoul(std::string(value)));
-		else if (key == "system-mode-write-file")
-			setKey(key, std::string(value));
-		else if (key == "system-mode-read-results-file")
-			setKey(key, stoul(std::string(value)));
-		else if (key == "bash-use-basic-parser")
-			setKey(key, stoul(std::string(value)));
-		else if (key == "lldb-use-raw-breakpoint-writes")
-			setKey(key, stoul(std::string(value)));
-		else if (key == "command-name")
-			setKey(key, std::string(value));
-		else if (key == "css-file")
-			setKey(key, std::string(value));
-		else if (key == "merged-name")
-			setKey(key, std::string(value));
-		else if (key == "coveralls-service-name")
-			setKey(key, std::string(value));
-		else
-			panic("Unknown key %s\n", key.c_str());
-	}
-
-	const char *getConfigurableValues()
-	{
-		return "                           bash-use-basic-parser=1    Enable simple bash parser\n"
-				"                           command-name=STR           Name of executed command\n"
-				"                           css-file=FILE              Filename of bcov.css file\n"
-				"                           high-limit=NUM             Percentage for high coverage\n"
-				"                           low-limit=NUM              Percentage for low coverage\n"
-				"                           merged-name=STR            Name of [merged] tag in HTML\n"
-				"                           coveralls-service-name=STR Service name for coveralls\n";
-	}
-
-	std::string uncommonOptions()
-	{
-		if (!m_printUncommon)
-			return " --uncommon-options      print uncommon options for --help\n";
-
-		return fmt(
-				" --replace-src-path=path replace the string found before the : with the string \n"
-						"                         found after the :\n"
-						" --path-strip-level=num  path levels to show for common paths (default: %d)\n"
-						"\n"
-						" --gcov                  use gcov parser instead of DWARF debugging info\n"
-						" --clang                 use Clang Sanitizer-coverage parser\n"
-						" --system-record         perform full-system instrumentation\n"
-						" --system-report         report full-system coverage data\n"
-						" --skip-solibs           don't parse shared libraries (default: parse solibs)\n"
-						" --exit-first-process    exit when the first process exits, i.e., honor the\n"
-						"                         behavior of daemons (default: wait until last)\n"
-						" --output-interval=ms    Interval to produce output in milliseconds (0 to\n"
-						"                         only output when kcov terminates, default %d)\n"
-						"\n"
-						" --debug=X               set kcov debugging level (max 31, default 0)\n"
-						"\n"
-						" --configure=key=value,... Manually set configuration values. Possible values:\n"
-						"%s"
-						"\n"
-						" --verify                verify breakpoint setup (to catch compiler bugs)\n"
-						"\n"
-						" --python-parser=cmd     Python parser to use (for python script coverage),\n"
-						"                         default: %s\n"
-						" --bash-parser=cmd       Bash parser to use (for bash/sh script coverage),\n"
-						"                         default: %s\n"
-						" --patchelf=cmd          patchelf binary to use (for system mode),\n"
-						"                         default: %s\n"
-						" --bash-method=method    Bash coverage collection method, PS4 (default) or DEBUG\n"
-						" --bash-handle-sh-invocation  Try to handle #!/bin/sh scripts by a LD_PRELOAD\n"
-						"                         execve replacement. Buggy on some systems\n"
-						" --bash-dont-parse-binary-dir Don't parse the binary directory for other scripts\n"
-						" --bash-parse-files-in-dir=dir[,...]  Parse bash scripts in dir(s)\n",
-				keyAsInt("path-strip-level"), keyAsInt("output-interval"),
-				getConfigurableValues(), keyAsString("python-command").c_str(),
-				keyAsString("bash-command").c_str(),
-				keyAsString("patchelf-command").c_str());
-	}
-
-	bool isInteger(std::string str)
-	{
-		size_t pos;
-
-		try
-		{
-			stoul(str, &pos);
-		} catch (std::invalid_argument &e)
-		{
-			return false;
-		}
-
-		return pos == str.size();
-	}
-
-	void expandPath(StrVecMap_t &paths)
-	{
-		for (StrVecMap_t::iterator it = paths.begin(); it != paths.end(); ++it)
-		{
-			std::string &s = *it;
-
-			if (s[0] == '~')
-				s = get_home() + s.substr(1, s.size());
-			*it = s;
-		}
-	}
-
-	StrVecMap_t getCommaSeparatedList(std::string str)
-	{
-		StrVecMap_t out;
-
-		if (str.find(',') == std::string::npos)
-		{
-			out.push_back(str);
-			return out;
-		}
-
-		size_t pos, lastPos;
-
-		lastPos = 0;
-		for (pos = str.find_first_of(","); pos != std::string::npos;
-				pos = str.find_first_of(",", pos + 1))
-		{
-			std::string cur = str.substr(lastPos, pos - lastPos);
-
-			out.push_back(cur);
-			lastPos = pos + 1;
-		}
-		out.push_back(str.substr(lastPos, str.size() - lastPos));
-
-		return out;
-	}
-
-	StringKeyMap_t m_strings;
-	IntKeyMap_t m_ints;
-	StrVecKeyMap_t m_stringVectors;
-
-	const char **m_programArgs;
-	unsigned int m_argc;
-	bool m_printUncommon;
-
-	ListenerMap_t m_listeners;
-};
-
-IConfiguration & IConfiguration::getInstance()
-{
-	static Configuration *g_instance;
-
-	if (!g_instance)
-		g_instance = new Configuration();
-
-	return *g_instance;
-}
diff --git a/kcov-38/src/dummy-solib-handler.cc b/kcov-38/src/dummy-solib-handler.cc
deleted file mode 100644
index 203d1489085c..000000000000
--- a/kcov-38/src/dummy-solib-handler.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <solib-handler.hh>
-
-using namespace kcov;
-
-class DummySolibHandler : public ISolibHandler
-{
-public:
-	virtual void startup()
-	{
-	}
-};
-
-void kcov::blockUntilSolibDataRead()
-{
-}
-
-ISolibHandler &kcov::createSolibHandler(IFileParser &parser, ICollector &collector)
-{
-	return *new DummySolibHandler();
-}
diff --git a/kcov-38/src/engine-factory.cc b/kcov-38/src/engine-factory.cc
deleted file mode 100644
index 4197493f45b3..000000000000
--- a/kcov-38/src/engine-factory.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <engine.hh>
-#include <utils.hh>
-
-#include <vector>
-
-using namespace kcov;
-
-class EngineFactory: public IEngineFactory
-{
-public:
-	EngineFactory()
-	{
-	}
-
-	void registerEngine(IEngineCreator &engine)
-	{
-		m_engines.push_back(&engine);
-	}
-
-	IEngineCreator &matchEngine(const std::string &fileName)
-	{
-		IEngineCreator *best = NULL;
-		size_t sz;
-
-		uint8_t *data = (uint8_t *) peek_file(&sz, "%s", fileName.c_str());
-
-		for (EngineList_t::iterator it = m_engines.begin();
-				it != m_engines.end(); ++it)
-		{
-			if (!best)
-				best = *it;
-
-			if ((*it)->matchFile(fileName, data, sz)
-					> best->matchFile(fileName, data, sz))
-				best = *it;
-		}
-		free((void *) data);
-
-		if (!best)
-			panic("No engines registered");
-
-		return *best;
-	}
-
-private:
-	typedef std::vector<IEngineCreator *> EngineList_t;
-
-	EngineList_t m_engines;
-};
-
-IEngineFactory::IEngineCreator::IEngineCreator()
-{
-	IEngineFactory::getInstance().registerEngine(*this);
-}
-
-static EngineFactory *g_instance;
-IEngineFactory &IEngineFactory::getInstance()
-{
-	if (!g_instance)
-		g_instance = new EngineFactory();
-
-	return *g_instance;
-}
diff --git a/kcov-38/src/engines/bash-engine.cc b/kcov-38/src/engines/bash-engine.cc
deleted file mode 100644
index 1df823589de8..000000000000
--- a/kcov-38/src/engines/bash-engine.cc
+++ /dev/null
@@ -1,845 +0,0 @@
-#define _WITH_GETLINE	// Needed on FreeBSD < 12.0
-#include <file-parser.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <lineid.hh>
-#include <utils.hh>
-#include <generated-data-base.hh>
-#include <source-file-cache.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <signal.h>
-#include <dirent.h>
-#include <stdio.h>
-
-#include <list>
-#include <unordered_map>
-#include <vector>
-#include <algorithm>
-
-#include <swap-endian.hh>
-
-#include "script-engine-base.hh"
-
-using namespace kcov;
-
-extern GeneratedData bash_helper_data;
-extern GeneratedData bash_helper_debug_trap_data;
-extern GeneratedData bash_redirector_library_data;
-
-enum InputType
-{
-	INPUT_NORMAL,       // No multiline stuff
-	INPUT_QUOTE,        // "
-	INPUT_SINGLE_QUOTE, // '
-	INPUT_MULTILINE,    // backslash backslash
-};
-
-class BashEngine : public ScriptEngineBase
-{
-public:
-	BashEngine() :
-			ScriptEngineBase(), m_child(0), m_stderr(NULL), m_stdout(NULL), m_bashSupportsXtraceFd(false),
-			m_inputType(INPUT_NORMAL)
-	{
-	}
-
-	~BashEngine()
-	{
-		kill(SIGTERM);
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		int stderrPipe[2];
-		int stdoutPipe[2];
-
-		if (pipe(stderrPipe) < 0)
-		{
-			error("Failed to open pipe");
-
-			return false;
-		}
-
-		if (pipe(stdoutPipe) < 0)
-		{
-			error("Failed to open pipe");
-			close(stderrPipe[0]);
-			close(stderrPipe[1]);
-
-			return false;
-		}
-
-		m_bashSupportsXtraceFd = bashCanHandleXtraceFd();
-
-		std::string helperPath = IOutputHandler::getInstance().getBaseDirectory() + "bash-helper.sh";
-		std::string helperDebugTrapPath = IOutputHandler::getInstance().getBaseDirectory() + "bash-helper-debug-trap.sh";
-		std::string redirectorPath = IOutputHandler::getInstance().getBaseDirectory() + "libbash_execve_redirector.so";
-
-		if (write_file(bash_helper_data.data(), bash_helper_data.size(), "%s", helperPath.c_str()) < 0)
-		{
-			error("Can't write helper");
-
-			return false;
-		}
-		if (write_file(bash_helper_debug_trap_data.data(), bash_helper_debug_trap_data.size(), "%s",
-				helperDebugTrapPath.c_str()) < 0)
-		{
-			error("Can't write helper");
-
-			return false;
-		}
-		if (write_file(bash_redirector_library_data.data(), bash_redirector_library_data.size(), "%s",
-				redirectorPath.c_str()) < 0)
-		{
-			error("Can't write redirector library at %s", redirectorPath.c_str());
-
-			return false;
-		}
-
-		m_listener = &listener;
-
-		/* Launch child */
-		m_child = fork();
-		if (m_child > 0)
-		{
-
-			// Close the parents write end of the pipe
-			close(stderrPipe[1]);
-			close(stdoutPipe[1]);
-
-			// And open a FILE * to stderr
-			m_stderr = fdopen(stderrPipe[0], "r");
-			if (!m_stderr)
-			{
-				error("Can't reopen the stderr pipe");
-				return false;
-			}
-			m_stdout = fdopen(stdoutPipe[0], "r");
-			if (!m_stdout)
-			{
-				error("Can't reopen the stdout pipe");
-				fclose(m_stderr);
-
-				return false;
-			}
-
-		}
-		else if (m_child == 0)
-		{
-			const char **argv = conf.getArgv();
-			unsigned int argc = conf.getArgc();
-			int xtraceFd = 782; // Typical bash users use 3,4 etc but not high fd numbers (?)
-			{
-				// However, the range of fd numbers that this process can use is limited by the caller of this process.
-				// The following code specification will require discussion with many kcov users.
-				struct rlimit rlim;
-				if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
-					perror("Failed to get the maximum number of open file descriptors.");
-					return false;
-				}
-				xtraceFd = rlim.rlim_cur / 4;
-			}
-			const std::string command = conf.keyAsString("bash-command");
-			bool usePS4 = conf.keyAsInt("bash-use-ps4");
-
-			// Revert to stderr if this bash version can't handle BASH_XTRACE
-			if (usePS4 && !m_bashSupportsXtraceFd)
-				xtraceFd = 2;
-
-			if (dup2(stderrPipe[1], xtraceFd) < 0)
-			{
-				perror("Failed to exchange stderr for pipe");
-				return false;
-			}
-			if (dup2(stdoutPipe[1], 1) < 0)
-			{
-				perror("Failed to exchange stderr for pipe");
-				return false;
-			}
-
-			/* Close the childs old write end of the pipe */
-			close(stderrPipe[1]);
-			close(stdoutPipe[1]);
-
-			/* Close the childs read end of the pipe */
-			close(stderrPipe[0]);
-			close(stdoutPipe[0]);
-
-			doSetenv(fmt("KCOV_BASH_XTRACEFD=%d", xtraceFd));
-			// Export the bash command for use in the bash-execve-redirector library
-			doSetenv(fmt("KCOV_BASH_COMMAND=%s", command.c_str()));
-
-			/* Set up PS4 for tracing */
-			if (usePS4)
-			{
-				doSetenv(fmt("BASH_ENV=%s", helperPath.c_str()));
-				doSetenv(fmt("BASH_XTRACEFD=%d", xtraceFd));
-				doSetenv("PS4=kcov@${BASH_SOURCE}@${LINENO}@");
-			}
-			else
-			{
-				// Use DEBUG trap
-				doSetenv(fmt("BASH_ENV=%s", helperDebugTrapPath.c_str()));
-				doSetenv(fmt("KCOV_BASH_USE_DEBUG_TRAP=1"));
-			}
-
-			// And preload it!
-			if (conf.keyAsInt("bash-handle-sh-invocation"))
-				doSetenv(std::string("LD_PRELOAD=" + redirectorPath));
-
-			// Make a copy of the vector, now with "bash -x" first
-			char **vec;
-			int argcStart = usePS4 ? 2 : 1;
-			vec = (char **) xmalloc(sizeof(char *) * (argc + 3));
-			vec[0] = xstrdup(conf.keyAsString("bash-command").c_str());
-
-			if (usePS4)
-				vec[1] = xstrdup("-x");
-			for (unsigned i = 0; i < argc; i++)
-				vec[argcStart + i] = xstrdup(argv[i]);
-
-			/* Execute the script */
-			if (execv(vec[0], vec))
-			{
-				perror("Failed to execute script");
-
-				free(vec);
-
-				return false;
-			}
-		}
-		else if (m_child < 0)
-		{
-			perror("fork");
-
-			return false;
-		}
-
-		std::vector<std::string> dirsToParse = conf.keyAsList("bash-parse-file-dir");
-
-		for (std::vector<std::string>::iterator it = dirsToParse.begin(); it != dirsToParse.end(); ++it)
-		{
-			parseDirectoryForFiles(*it);
-		}
-
-		// Parse the directory where the script-under-test is for other bash scripts
-		if (conf.keyAsInt("bash-parse-binary-dir"))
-		{
-			parseDirectoryForFiles(conf.keyAsString("binary-path"));
-		}
-		parseFile(executable);
-
-		return true;
-	}
-
-	bool checkEvents()
-	{
-		char *curLine = NULL;
-		ssize_t len;
-		size_t linecap = 0;
-
-		// First printout any collected stdout data
-		handleStdout();
-
-		len = getline(&curLine, &linecap, m_stderr);
-		if (len < 0)
-			return false;
-
-		std::string cur(curLine);
-		// Line markers always start with kcov@
-
-		if (m_inputType == INPUT_SINGLE_QUOTE) {
-			m_inputType = getInputType(cur);
-			return true;
-		}
-
-		size_t kcovStr = cur.find("kcov@");
-		if (kcovStr == std::string::npos)
-		{
-			fprintf(stderr, "%s", cur.c_str());
-			return true;
-		}
-		m_inputType = getInputType(cur);
-
-		std::vector<std::string> parts = split_string(cur.substr(kcovStr), "@");
-
-		// kcov@FILENAME@LINENO@...
-		if (parts.size() < 3)
-			return true;
-
-		// Resolve filename (might be relative)
-		const std::string &filename = get_real_path(parts[1]);
-		const std::string &lineNo = parts[2];
-
-		// Skip the helper libraries
-		if (filename.find("bash-helper.sh") != std::string::npos)
-			return true;
-		if (filename.find("bash-helper-debug-trap.sh") != std::string::npos)
-			return true;
-
-		if (!string_is_integer(lineNo))
-		{
-			error("%s is not an integer", lineNo.c_str());
-
-			return false;
-		}
-
-		if (!m_reportedFiles[filename])
-		{
-			m_reportedFiles[filename] = true;
-
-			for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
-				(*it)->onFile(File(filename, IFileParser::FLG_NONE));
-
-			parseFile(filename);
-		}
-
-		if (m_listener)
-		{
-			uint64_t address = 0;
-			Event ev;
-
-			LineIdToAddressMap_t::iterator it = m_lineIdToAddress.find(getLineId(filename, string_to_integer(lineNo)));
-			if (it != m_lineIdToAddress.end())
-				address = it->second;
-
-			ev.type = ev_breakpoint;
-			ev.addr = address;
-			ev.data = 1;
-
-			m_listener->onEvent(ev);
-		}
-
-		return true;
-	}
-
-	bool continueExecution()
-	{
-		if (checkEvents())
-			return true;
-
-		// Otherwise wait for child
-		int status;
-		int rv;
-
-		rv = waitpid(m_child, &status, WNOHANG);
-		if (rv != m_child)
-		{
-			return true;
-		}
-		else
-		{
-			// Child exited, let's make sure that we have all the events/stdout.
-			checkEvents();
-		}
-
-		if (WIFEXITED(status))
-		{
-			reportEvent(ev_exit_first_process, WEXITSTATUS(status));
-		}
-		else
-		{
-			warning("Other status: 0x%x\n", status);
-			reportEvent(ev_error, -1);
-		}
-
-		return false;
-	}
-
-	void kill(int signal)
-	{
-		if (m_child == 0)
-			return;
-
-		::kill(m_child, signal);
-	}
-
-	std::string getParserType()
-	{
-		return "bash";
-	}
-
-	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		std::string s((const char *) data, 80);
-
-		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".sh")
-			return 200;
-
-		if (s.find("#!/bin/bash") != std::string::npos)
-			return 400;
-		if (s.find("#!/bin/sh") != std::string::npos)
-			return 300;
-		if (s.find("bash") != std::string::npos)
-			return 100;
-		if (s.find("sh") != std::string::npos)
-			return 50;
-
-		return match_none;
-	}
-
-private:
-	void parseDirectoryForFiles(const std::string &base)
-	{
-		DIR *dir = ::opendir(base.c_str());
-		if (!dir)
-		{
-			error("Can't open directory %s\n", base.c_str());
-			return;
-		}
-
-		// Loop through the directory structure
-		struct dirent *de;
-		for (de = ::readdir(dir); de; de = ::readdir(dir))
-		{
-			std::string cur = base + "/" + de->d_name;
-
-			if (strcmp(de->d_name, ".") == 0)
-				continue;
-
-			if (strcmp(de->d_name, "..") == 0)
-				continue;
-
-			struct stat st;
-
-			if (lstat(cur.c_str(), &st) < 0)
-				continue;
-
-			if (S_ISDIR(st.st_mode))
-			{
-				parseDirectoryForFiles(cur);
-			}
-			else
-			{
-				size_t sz;
-				uint8_t *p = (uint8_t *) read_file(&sz, "%s", cur.c_str());
-
-				if (p)
-				{
-					// Bash file?
-					if (matchParser(cur, p, sz) != match_none)
-					{
-						parseFile(cur);
-					}
-
-				}
-				free((void *) p);
-			}
-		}
-		::closedir(dir);
-	}
-
-	// Printout lines to stdout, except kcov markers
-	void handleStdout()
-	{
-		// No need if we have xtrace fd support
-		if (m_bashSupportsXtraceFd)
-		{
-			return;
-		}
-
-		char *curLine = NULL;
-		size_t linecap = 0;
-
-		while (file_readable(m_stdout, 0) && getline(&curLine, &linecap, m_stdout) > 0)
-		{
-			/* Check for line markers to filter these away.
-			 *
-			 * For some reason, redirection sometimes give kkcov@..., so filter that
-			 * in addition to the obvious stuff
-			 */
-			size_t kcovMarker = std::string(curLine).find("kcov@");
-
-			if (kcovMarker != 0 && kcovMarker != 1)
-			{
-				printf("%s", curLine);
-			}
-		}
-		free(curLine);
-	}
-
-	bool bashCanHandleXtraceFd()
-	{
-		FILE *fp;
-		bool out = false;
-		IConfiguration &conf = IConfiguration::getInstance();
-		std::string cmd = conf.keyAsString("bash-command") + " -c 'echo \"$BASH_VERSION\"'";
-
-		/* Has input via stderr been forced regardless of bash version?
-		 * Basically for testing only
-		 */
-		if (conf.keyAsInt("bash-force-stderr-input"))
-			return false;
-
-		fp = popen(cmd.c_str(), "r");
-		if (!fp)
-			return false;
-
-		int major = 0;
-		int minor = 0;
-
-		// Read the first line
-		if (fscanf(fp, "%d.%d", &major, &minor) != EOF) {
-			// Bash 4.2 and above supports BASH_XTRACEFD
-			if (major > 4 || (major == 4 && minor >= 2))
-				out = true;
-		}
-
-		pclose(fp);
-
-		return out;
-	}
-
-	enum InputType getInputType(const std::string &str)
-	{
-		enum InputType out = m_inputType;
-
-		for(std::string::size_type i = 0; i < str.size(); ++i) {
-			if (str[i] == '\\' && out == INPUT_NORMAL)
-				i++;
-			else if (str[i] == '\'')
-				out = (out == INPUT_NORMAL ? INPUT_SINGLE_QUOTE : INPUT_NORMAL);
-		}
-
-		return out;
-	}
-
-	void doSetenv(const std::string &val)
-	{
-		// "Leak" some bytes, but the environment needs that
-		char *envString = (char *) xmalloc(val.size() + 1);
-
-		strcpy(envString, val.c_str());
-
-		putenv(envString);
-	}
-
-	// Sweep through lines in a file to determine what is valid code
-	void parseFile(const std::string &filename)
-	{
-		if (!m_listener)
-			return;
-		ISourceFileCache &cache = ISourceFileCache::getInstance();
-
-		std::vector<std::string> lines = cache.getLines(filename);
-
-		// Compute hash for this file
-		uint32_t crc = cache.getCrc(filename);
-
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		if (conf.keyAsInt("bash-use-basic-parser"))
-			parseFileBasic(filename, lines, crc);
-		else
-			parseFileFull(filename, lines, crc);
-	}
-
-	void parseFileBasic(const std::string &filename, const std::vector<std::string> &lines, uint32_t crc)
-	{
-		unsigned int lineNo = 0;
-
-		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
-		{
-			std::string s = trim_string(*it);
-
-			lineNo++;
-
-			kcov_debug(ENGINE_MSG, "bash_line %2d: %s\n", lineNo, s.c_str());
-
-			// Remove comments
-			size_t comment = s.find("#");
-			if (comment != std::string::npos)
-			{
-
-				// But not $# or ${#variable}...
-				if ((comment >= 1 && s[comment - 1] == '$')
-						|| (comment >= 2 && s.rfind("${", comment) != std::string::npos
-								&& s.find("}", comment) != std::string::npos))
-				{
-					// Do nothing
-					// Nor if in a string
-				}
-				else if (comment >= 1 && (s.find("\"") < comment || s.find("'") < comment))
-				{
-					// Do nothing
-				}
-				else
-				{
-					s = trim_string(s);
-					s = s.substr(0, comment);
-				}
-			}
-
-			// Empty line, ignore
-			if (s == "")
-				continue;
-
-			// While, if, switch endings
-			if (s == "esac" || s == "fi" || s == "do" || s == "done" || s == "else" || s == "then" || s == "}" || s == "{")
-				continue;
-
-			// Functions
-			if (s.find("function") == 0)
-				continue;
-
-			fileLineFound(crc, filename, lineNo);
-		}
-	}
-
-	void parseFileFull(const std::string &filename, const std::vector<std::string> &lines, uint32_t crc)
-	{
-		unsigned int lineNo = 0;
-		enum
-		{
-			none, backslash, quote, heredoc
-		} state = none;
-		bool caseActive = false;
-		bool arithmeticActive = false;
-		std::string heredocMarker;
-
-		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
-		{
-			std::string s = trim_string(*it);
-
-			lineNo++;
-
-			kcov_debug(ENGINE_MSG, "bash_line %2d: %s\n", lineNo, s.c_str());
-
-			// Remove comments
-			size_t comment = s.find("#");
-			if (comment != std::string::npos)
-			{
-
-				// But not $# or ${#variable}...
-				if ((comment >= 1 && s[comment - 1] == '$')
-						|| (comment >= 2 && s.rfind("${", comment) != std::string::npos
-								&& s.find("}", comment) != std::string::npos))
-				{
-					// Do nothing
-					// Nor if in a string
-				}
-				else if (comment >= 1 && (s.find("\"") < comment || s.find("'") < comment))
-				{
-					// Do nothing
-				}
-				else
-				{
-					s = trim_string(s);
-					s = s.substr(0, comment);
-				}
-			}
-
-			// Empty line, ignore
-			if (s == "")
-				continue;
-
-			if (s.size() >= 2 && s[0] == ';' && s[1] == ';')
-				continue;
-
-			// Empty braces
-			if ((s[0] == '{' || s[0] == '}') && s.size() == 1)
-				continue;
-
-			// While, if, switch endings
-			if (s == "esac" || s == "fi" || s == "do" || s == "done" || s == "else" || s == "then")
-				continue;
-
-			// Functions
-			if (s.find("function") == 0)
-				continue;
-
-			// fn() { .... Yes, regexes would have been better
-			size_t fnPos = s.find("()");
-			if (fnPos != std::string::npos)
-			{
-				// Trim valid last spaces between function name and parenthesis
-				while (fnPos > 1 && ' ' == s[fnPos - 1])
-				{
-					--fnPos;
-				}
-
-				std::string substr = s.substr(0, fnPos);
-
-				// Should be a single word (the function name)
-				if (substr.find(" ") == std::string::npos)
-					continue;
-			}
-
-			// Handle backslashes - only the first line is code
-			if (state == backslash)
-			{
-				if (s[s.size() - 1] != '\\')
-					state = none;
-				continue;
-			}
-
-			// Multi-line quote - only the last line is code
-			if (state == quote)
-			{
-				if (s.find('"') == s.size() - 1) // String ends with "
-					state = none;
-				else
-					continue;
-			}
-
-			// HERE documents
-			if (state == heredoc)
-			{
-				std::string trimmed = trim_string(s, " \t\r\n`");
-
-				if (trimmed == heredocMarker)
-					state = none;
-				continue;
-			}
-
-			if (s.find("$((") != std::string::npos || s.find("$[") != std::string::npos)
-				arithmeticActive = true;
-
-			if (s[s.size() - 1] == '\\')
-			{
-				state = backslash;
-			}
-			else if ((s.find("=\"") != std::string::npos || // Handle multi-line string assignments
-					s.find("= \"") != std::string::npos) && std::count(s.begin(), s.end(), '"') == 1)
-			{
-				state = quote;
-				continue;
-			}
-			else
-			{
-				size_t heredocStart = s.find("<<");
-
-				if (!arithmeticActive && s.find("let ") != 0 && s.find("$((") == std::string::npos
-						&& s.find("))") == std::string::npos && heredocStart != std::string::npos)
-				{
-					// Skip << and remove spaces before and after "EOF"
-					heredocMarker = trim_string(s.substr(heredocStart + 2, s.size()));
-
-					// Make sure the heredoc marker is a word
-					for (unsigned int i = 0; i < heredocMarker.size(); i++)
-					{
-						if (heredocMarker[i] == ' ' || heredocMarker[i] == '\t')
-						{
-							heredocMarker = heredocMarker.substr(0, i);
-							break;
-						}
-					}
-
-					if (heredocMarker[0] == '-')
-					{
-						// '-' marks tab-suppression in heredoc
-						heredocMarker = heredocMarker.substr(1);
-					}
-
-					if (heredocMarker.length() > 2 && (heredocMarker[0] == '"' || heredocMarker[0] == '\'')
-							&& heredocMarker[0] == heredocMarker[heredocMarker.length() - 1])
-					{
-						// remove enclosing in quotes
-						heredocMarker = heredocMarker.substr(1, heredocMarker.length() - 2);
-					}
-
-					if (heredocMarker.size() > 0 && heredocMarker[0] != '<')
-						state = heredoc;
-
-					std::string beforeHeredoc = trim_string(s.substr(0, heredocStart));
-					/*
-					 * Special case for things like
-					 * while read -r line ; do
-					 *     echo $line
-					 * done <<EOF
-					 * xxx
-					 * yyy
-					 * EOF
-					 *
-					 * where the done statement is nocode (as above)
-					 */
-					if (beforeHeredoc == "done")
-						continue;
-				}
-			}
-
-			if (s.find("case") == 0)
-				caseActive = true;
-			else if (s.find("esac") == 0)
-				caseActive = false;
-
-			if (s.find("))") != std::string::npos || s.find("]") != std::string::npos)
-				arithmeticActive = false;
-
-			// Only the last line of arithmetic is code
-			if (arithmeticActive)
-				continue;
-
-			// Case switches are nocode
-			if (caseActive && s[s.size() - 1] == ')')
-			{
-				// But let functions be (albeit not with balanced parentheses)
-				size_t startParenthesis = s.find("(");
-				if (startParenthesis == std::string::npos || startParenthesis == 0)
-					continue;
-			}
-
-			fileLineFound(crc, filename, lineNo);
-		}
-	}
-
-	pid_t m_child;
-	FILE *m_stderr;
-	FILE *m_stdout;
-	bool m_bashSupportsXtraceFd;
-	enum InputType m_inputType;
-};
-
-// This ugly stuff should be fixed
-static BashEngine *g_bashEngine;
-class BashCtor
-{
-public:
-	BashCtor()
-	{
-		g_bashEngine = new BashEngine();
-	}
-};
-static BashCtor g_bashCtor;
-
-class BashEngineCreator: public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~BashEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return g_bashEngine;
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		std::string s((const char *) data, 80);
-
-		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".sh")
-			return 200;
-
-		if (s.find("#!/bin/bash") != std::string::npos)
-			return 400;
-		if (s.find("#!/bin/sh") != std::string::npos)
-			return 300;
-		if (s.find("bash") != std::string::npos)
-			return 100;
-		if (s.find("sh") != std::string::npos)
-			return 50;
-
-		return match_none;
-	}
-};
-
-static BashEngineCreator g_bashEngineCreator;
diff --git a/kcov-38/src/engines/bash-execve-redirector.c b/kcov-38/src/engines/bash-execve-redirector.c
deleted file mode 100644
index 8a2b444b9ea1..000000000000
--- a/kcov-38/src/engines/bash-execve-redirector.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <dlfcn.h>
-
-// Peek the first few bytes of a file (i.e., #!/bin/sh etc)
-static int peek_file(const char *filename, char *buf, int bufSize)
-{
-	FILE *fp = fopen(filename, "r");
-	int rv;
-
-	if (!fp)
-		return -1;
-
-	rv = fread(buf, 1, bufSize, fp);
-
-	fclose(fp);
-
-	return rv;
-}
-
-static char *kcovBash;
-static int kcovUseDebugTrap;
-
-static int (*orig_execve)(const char *filename, char * const argv[], char * const envp[]);
-int execve(const char *filename, char * const argv[], char * const envp[])
-{
-	char startBytes[128];
-	int sizeRead;
-	const char bashArg[3] =
-	{ '-', 'x', '\0' };
-
-	if (!orig_execve)
-		orig_execve = dlsym(RTLD_NEXT, "execve");
-
-	sizeRead = peek_file(filename, startBytes, sizeof(startBytes));
-
-	// Make sure it's NULL-terminated
-	startBytes[sizeof(startBytes) - 1] = '\0';
-	if (sizeRead >= 0)
-		startBytes[sizeRead] = '\0';
-
-	// Shell script being executed?
-	if (kcovBash && sizeRead >= 6
-			&& (strstr(startBytes, "/bin/sh") != NULL || strstr(startBytes, "/bin/bash") != NULL
-					|| strstr(startBytes, "/bin/ash") != NULL || strstr(startBytes, "/bin/dash") != NULL ))
-	{
-		char **replacementArgv;
-		unsigned i = 0;
-
-		// Find end
-		for (i = 0; argv[i]; i++)
-			;
-
-		unsigned arg = 0;
-
-		replacementArgv = malloc(sizeof(char*) * (i + 4));
-		replacementArgv[arg++] = strdup(kcovBash);
-		if (!kcovUseDebugTrap)
-			replacementArgv[arg++] = strdup(bashArg);
-		replacementArgv[arg++] = strdup(filename);
-		for (i = 0; argv[i]; i++)
-			replacementArgv[i + arg] = strdup(argv[i]);
-		replacementArgv[i + arg] = NULL;
-
-		filename = strdup(kcovBash);
-
-		argv = replacementArgv;
-	}
-
-	return orig_execve(filename, argv, envp);
-}
-
-void __attribute__((constructor)) kcov_bash_execve_at_startup(void)
-{
-	kcovBash = getenv("KCOV_BASH_COMMAND");
-	if (getenv("KCOV_BASH_USE_DEBUG_TRAP"))
-		kcovUseDebugTrap = 1;
-}
diff --git a/kcov-38/src/engines/bash-helper-debug-trap.sh b/kcov-38/src/engines/bash-helper-debug-trap.sh
deleted file mode 100755
index 6a1d12e7ca54..000000000000
--- a/kcov-38/src/engines/bash-helper-debug-trap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -o functrace
-trap 'echo "kcov@${BASH_SOURCE}@${LINENO}@" >&$KCOV_BASH_XTRACEFD' DEBUG
-unset BASH_ENV
diff --git a/kcov-38/src/engines/bash-helper.sh b/kcov-38/src/engines/bash-helper.sh
deleted file mode 100644
index 900e2e9b59fa..000000000000
--- a/kcov-38/src/engines/bash-helper.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Turn on tracing
-set -x
diff --git a/kcov-38/src/engines/clang-coverage-engine.cc b/kcov-38/src/engines/clang-coverage-engine.cc
deleted file mode 100644
index 66bad9e2e759..000000000000
--- a/kcov-38/src/engines/clang-coverage-engine.cc
+++ /dev/null
@@ -1,268 +0,0 @@
-#include <engine.hh>
-#include <utils.hh>
-#include <configuration.hh>
-#include <capabilities.hh>
-#include <file-parser.hh>
-#include <disassembler.hh>
-#include <elf.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <dirent.h>
-#include <signal.h>
-
-#include <vector>
-#include <unordered_map>
-#include <utility> // std::pair
-
-#include "../parsers/dwarf.hh"
-#include "script-engine-base.hh"
-
-using namespace kcov;
-
-class ClangEngine : public ScriptEngineBase, IFileParser::ILineListener
-{
-public:
-	ClangEngine() :
-			ScriptEngineBase(), m_child(-1), m_checksum(0)
-	{
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		char * const *argv = (char * const *) conf.getArgv();
-
-		m_listener = &listener;
-
-		// Run the program until completion
-		m_child = fork();
-		if (m_child == 0)
-		{
-			std::string env = fmt("ASAN_OPTIONS=coverage=1:coverage_dir=%s", conf.keyAsString("target-directory").c_str());
-
-			char *cpy = xstrdup(env.c_str());
-
-			putenv(cpy);
-			unsetenv("LD_PRELOAD");
-			execv(argv[0], argv);
-		}
-		else if (m_child < 0)
-		{
-			perror("fork");
-
-			return false;
-		}
-
-		return true;
-	}
-
-	bool continueExecution()
-	{
-		if (m_child < 0)
-			return false;
-
-		int status = 0;
-
-		// Wait for the child
-		waitpid(m_child, &status, 0);
-
-		m_child = -1;
-
-		// All coverage collection is done after the program has been run
-		DIR *dir;
-		struct dirent *de;
-
-		std::string targetDir = IConfiguration::getInstance().keyAsString("target-directory");
-		dir = opendir(targetDir.c_str());
-		panic_if(!dir, "Can't open directory\n");
-
-		for (de = readdir(dir); de; de = readdir(dir))
-		{
-			std::string cur = fmt("%s/%s", targetDir.c_str(), de->d_name);
-
-			// ... except for the current coveree
-			if (cur.find(".sancov") == std::string::npos)
-				continue;
-
-			parseCoverageFile(cur);
-		}
-		closedir(dir);
-
-		Event ev(ev_exit, WEXITSTATUS(status));
-
-		// Report the exit status
-		m_listener->onEvent(ev);
-
-		return false;
-	}
-
-	std::string getParserType()
-	{
-		return "clang-sanitizer";
-	}
-
-	virtual uint64_t getChecksum()
-	{
-		return m_checksum;
-	}
-
-	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		if (IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
-			return match_perfect;
-
-		return match_none;
-	}
-
-	virtual enum IFileParser::PossibleHits maxPossibleHits()
-	{
-		return IFileParser::HITS_SINGLE;
-	}
-
-	void kill(int signal)
-	{
-	}
-
-	bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
-	{
-		IElf *elf = IElf::create(filename);
-
-		if (!elf)
-			return false;
-
-		const std::vector<Segment> &segs = elf->getSegments();
-		for (std::vector<Segment>::const_iterator it = segs.begin(); it != segs.end(); ++it)
-			IDisassembler::getInstance().addSection(it->getData(), it->getSize(), it->getBase());
-
-		bool rv = m_dwarfParser.open(filename);
-
-		// Get a list of all possible source lines
-		if (rv)
-			m_dwarfParser.forEachLine(*this);
-
-		size_t sz;
-		uint8_t *p = (uint8_t *) read_file(&sz, "%s", filename.c_str());
-
-		m_checksum = hash_block(p, sz);
-
-		free(p);
-
-		return rv;
-	}
-
-private:
-	typedef std::vector<std::string> FileList_t;
-
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-
-		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
-			(*it)->onLine(get_real_path(file), lineNr, addr);
-	}
-
-	void parseCoverageFile(const std::string &name)
-	{
-		size_t sz;
-		void *p;
-
-		p = read_file(&sz, "%s", name.c_str());
-		if (!p)
-		{
-			return;
-		}
-
-		// Remove the coverage file for the next round
-		unlink(name.c_str());
-
-		// Only header?
-		if (sz < 8)
-		{
-			free(p);
-			return;
-		}
-
-		uint64_t header = *(uint64_t *) p;
-		// Assume native-endianness (?)
-		if (header == 0xC0BFFFFFFFFFFF64ULL)
-		{
-			size_t nEntries = (sz - sizeof(uint64_t)) / sizeof(uint64_t);
-			uint64_t *entries = &((uint64_t *) p)[1];
-
-			for (size_t i = 0; i < nEntries; i++)
-			{
-				m_dwarfParser.forAddress(*this, entries[i] + 1);
-				reportBreakpoint(entries[i] + 1);
-			}
-		}
-		else if (header == 0xC0BFFFFFFFFFFF32ULL)
-		{
-			size_t nEntries = (sz - sizeof(uint64_t)) / sizeof(uint32_t);
-			uint32_t *entries = &((uint32_t *) p)[1];
-
-			for (size_t i = 0; i < nEntries; i++)
-			{
-				m_dwarfParser.forAddress(*this, entries[i] + 1);
-				reportBreakpoint(entries[i] + 1);
-			}
-		}
-
-		free(p);
-	}
-
-	void reportBreakpoint(uint64_t address)
-	{
-		std::vector<uint64_t> bb = IDisassembler::getInstance().getBasicBlock(address);
-
-		for (std::vector<uint64_t>::iterator it = bb.begin(); it != bb.end(); ++it)
-			reportEvent(ev_breakpoint, 0, *it);
-
-		// Fallback in case kcov is broken
-		if (bb.empty())
-		{
-			kcov_debug(ENGINE_MSG, "Address 0x%llx not in a basic block\n", (long long) address);
-			reportEvent(ev_breakpoint, 0, address);
-		}
-	}
-
-	pid_t m_child;
-	DwarfParser m_dwarfParser;
-	uint64_t m_checksum;
-};
-
-static ClangEngine *g_clangEngine;
-class ClangCtor
-{
-public:
-	ClangCtor()
-	{
-		g_clangEngine = new ClangEngine();
-	}
-};
-static ClangCtor g_clangCtor;
-
-class ClangEngineCreator: public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~ClangEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return g_clangEngine;
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		if (IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
-			return match_perfect;
-
-		return match_none;
-	}
-};
-
-static ClangEngineCreator g_clangEngineCreator;
diff --git a/kcov-38/src/engines/gcov-engine.cc b/kcov-38/src/engines/gcov-engine.cc
deleted file mode 100644
index e2492c8db6cd..000000000000
--- a/kcov-38/src/engines/gcov-engine.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-#include <engine.hh>
-#include <utils.hh>
-#include <configuration.hh>
-#include <file-parser.hh>
-#include <gcov.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-
-#include <vector>
-#include <unordered_map>
-#include <utility> // std::pair
-
-using namespace kcov;
-
-class GcovEngine : public IEngine, IFileParser::IFileListener
-{
-public:
-	GcovEngine(IFileParser &parser) :
-			m_listener(NULL), m_child(-1)
-	{
-		parser.registerFileListener(*this);
-	}
-
-	int registerBreakpoint(unsigned long addr)
-	{
-		return 0;
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		char * const *argv = (char * const *) IConfiguration::getInstance().getArgv();
-
-		m_listener = &listener;
-
-		// Run the program until completion
-		m_child = fork();
-		if (m_child == 0)
-		{
-			execv(argv[0], argv);
-		}
-		else if (m_child < 0)
-		{
-			perror("fork");
-
-			return false;
-		}
-
-		return true;
-	}
-
-	void kill(int sig)
-	{
-	}
-
-	bool continueExecution()
-	{
-		if (m_child < 0)
-			return false;
-
-		int status;
-
-		// Wait for the child
-		waitpid(m_child, &status, 0);
-
-		m_child = -1;
-
-		// All coverage collection is done after the program has been run
-		for (FileList_t::const_iterator it = m_gcdaFiles.begin(); it != m_gcdaFiles.end(); ++it)
-		{
-			const std::string &gcda = *it;
-			std::string gcno = gcda;
-
-			size_t sz = gcno.size();
-
-			// .gcda -> .gcno
-			gcno[sz - 2] = 'n';
-			gcno[sz - 1] = 'o';
-
-			// Need a pair
-			if (!file_exists(gcno) || !file_exists(gcda))
-				continue;
-
-			parseGcovFiles(gcno, gcda);
-		}
-
-		Event ev(ev_exit, WEXITSTATUS(status));
-
-		// Report the exit status
-		m_listener->onEvent(ev);
-
-		return false;
-	}
-
-private:
-	typedef std::vector<std::string> FileList_t;
-
-	void parseGcovFiles(const std::string &gcnoFile, const std::string gcdaFile)
-	{
-		size_t sz;
-		void *d = read_file(&sz, "%s", gcnoFile.c_str());
-
-		if (!d)
-			return;
-		GcnoParser gcno((uint8_t *) d, sz);
-
-		void *d2 = read_file(&sz, "%s", gcdaFile.c_str());
-
-		if (!d2)
-			return;
-		GcdaParser gcda((uint8_t *) d2, sz);
-
-		gcno.parse();
-		gcda.parse();
-
-		std::unordered_map<int32_t, GcnoParser::BasicBlockList_t> bbsByNumber;
-
-		const GcnoParser::BasicBlockList_t &bbs = gcno.getBasicBlocks();
-		const GcnoParser::ArcList_t &arcs = gcno.getArcs();
-
-		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
-		{
-			const GcnoParser::BasicBlockMapping &cur = *it;
-
-			bbsByNumber[cur.m_basicBlock].push_back(cur);
-		}
-
-		std::unordered_map<int32_t, unsigned int> counterByFunction;
-		for (GcnoParser::ArcList_t::const_iterator it = arcs.begin(); it != arcs.end(); ++it)
-		{
-			const GcnoParser::Arc &cur = *it;
-
-			int64_t counter = gcda.getCounter(cur.m_function, counterByFunction[cur.m_function]);
-
-			counterByFunction[cur.m_function]++;
-
-			// Not found?
-			if (counter < 0)
-			{
-				warning("Arc %u but no counter\n", counterByFunction[cur.m_function]);
-				continue;
-			}
-
-			// No hit, so ignore
-			if (counter == 0)
-				continue;
-
-			reportBasicBlockHit(bbsByNumber[cur.m_dstBlock], counter);
-			reportBasicBlockHit(bbsByNumber[cur.m_srcBlock], counter);
-		}
-	}
-
-	void reportBasicBlockHit(const GcnoParser::BasicBlockList_t &bbs, int64_t counter)
-	{
-		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
-		{
-			const GcnoParser::BasicBlockMapping &bb = *it;
-
-			uint64_t addr = gcovGetAddress(bb.m_file, bb.m_function, bb.m_basicBlock, bb.m_index);
-			Event ev(ev_breakpoint, counter, addr);
-
-			m_listener->onEvent(ev);
-		}
-	}
-
-	// From IFileParser::IFileListener
-	void onFile(const IFileParser::File &file)
-	{
-		if (!(file.m_flags & IFileParser::FLG_TYPE_COVERAGE_DATA))
-			return;
-
-		m_gcdaFiles.push_back(file.m_filename);
-	}
-
-	FileList_t m_gcdaFiles;
-	IEventListener *m_listener;
-	pid_t m_child;
-};
-
-class GcovEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~GcovEngineCreator()
-	{
-	}
-
-	virtual IEngine *create(IFileParser &parser)
-	{
-		return new GcovEngine(parser);
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		if (!IConfiguration::getInstance().keyAsInt("gcov"))
-			return match_none;
-
-		return match_perfect;
-	}
-};
-
-static GcovEngineCreator g_gcovEngineCreator;
diff --git a/kcov-38/src/engines/kernel-engine.cc b/kcov-38/src/engines/kernel-engine.cc
deleted file mode 100644
index a0d12136f8cf..000000000000
--- a/kcov-38/src/engines/kernel-engine.cc
+++ /dev/null
@@ -1,189 +0,0 @@
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <utils.hh>
-#include <zlib.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-
-#include <list>
-#include <unordered_map>
-
-using namespace kcov;
-
-class KernelEngine : public IEngine
-{
-public:
-	KernelEngine() :
-			m_control(NULL), m_show(NULL), m_listener(NULL)
-	{
-	}
-
-	~KernelEngine()
-	{
-		kill(0);
-	}
-
-	// From IEngine
-	int registerBreakpoint(unsigned long addr)
-	{
-		// Don't register the same BP twice
-		if (m_addresses.find(addr) != m_addresses.end())
-			return 0;
-
-		m_addresses[addr] = true;
-
-		std::string s = fmt("%s0x%llx\n", m_module.c_str(), (unsigned long long) addr);
-
-		kcov_debug(ENGINE_MSG, "KNRL set BP at 0x%llx\n", (unsigned long long) addr);
-		panic_if(!m_control, "Control file not open???");
-
-		fprintf(m_control, "%s", s.c_str());
-		fflush(m_control);
-
-		return 0;
-	}
-
-	void setupAllBreakpoints()
-	{
-	}
-
-	bool clearBreakpoint(const Event &ev)
-	{
-		return true;
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		std::string path = IConfiguration::getInstance().keyAsString("kernel-coverage-path");
-		std::string control = path + "/control";
-		std::string show = path + "/show";
-
-		m_listener = &listener;
-
-		// Open kprobe-coverage files
-		m_control = fopen(control.c_str(), "w");
-		m_show = fopen(show.c_str(), "r");
-
-		if (!m_control || !m_show)
-		{
-			error("Can't open kprobe-coverage files. Is the kprobe-coverage module loaded?");
-
-			kill(0);
-			return false;
-		}
-
-		return true;
-	}
-
-	bool continueExecution()
-	{
-		char buf[256]; // More than enough for one line
-		char *p;
-
-		p = fgets(buf, sizeof(buf) - 1, m_show);
-		if (!p)
-			return false;
-
-		buf[sizeof(buf) - 1] = '\0';
-		buf[strlen(buf) - 1] = '\0'; // Remove the \n
-
-		parseOneLine(buf);
-
-		return true;
-	}
-
-	void kill(int sig)
-	{
-		if (m_control)
-		{
-			fprintf(m_control, "clear\n");
-			fclose(m_control);
-		}
-		if (m_show)
-			fclose(m_show);
-
-		m_control = NULL;
-		m_show = NULL;
-	}
-
-private:
-	void parseOneLine(const std::string &line)
-	{
-		std::string moduleName;
-		std::string addr;
-
-		size_t pos = line.find(":");
-
-		if (pos != std::string::npos)
-		{
-			moduleName = line.substr(0, pos);
-			addr = line.substr(pos + 1);
-		}
-		else
-		{
-			addr = line;
-		}
-
-		// Invalid?
-		if (!string_is_integer(addr, 16))
-			return;
-
-		uint64_t value = string_to_integer(addr, 16);
-
-		kcov_debug(ENGINE_MSG, "KNRL BP at 0x%llx\n", (unsigned long long) value);
-
-		m_listener->onEvent(Event(ev_breakpoint, 0, value));
-	}
-
-	FILE *m_control;
-	FILE *m_show;
-	IEventListener *m_listener;
-
-	std::unordered_map<unsigned long, bool> m_addresses;
-
-	std::string m_module;
-};
-
-class KernelEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~KernelEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return new KernelEngine();
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		if (filename.find("vmlinux") != std::string::npos)
-			return match_perfect;
-
-		if (filename.find(".ko") == std::string::npos)
-			return match_none;
-
-		// Fix this somehow
-#if 0
-		m_module = filename;
-		size_t slashPos = m_module.rfind("/");
-		if (slashPos == std::string::npos)
-		slashPos = 0;
-		else
-		slashPos++; // Skip the actual slash
-
-		// Remove path before and .ko after the name
-		m_module = m_module.substr(slashPos, m_module.size() - slashPos - 3) + ":";
-#endif
-
-		return match_perfect;
-	}
-};
-static KernelEngineCreator g_kernelEngineCreator;
diff --git a/kcov-38/src/engines/lldb-engine.cc b/kcov-38/src/engines/lldb-engine.cc
deleted file mode 100644
index ab5c924f4a03..000000000000
--- a/kcov-38/src/engines/lldb-engine.cc
+++ /dev/null
@@ -1,486 +0,0 @@
-#include <file-parser.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <filter.hh>
-#include <utils.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/param.h>
-#include <signal.h>
-
-#include <list>
-#include <unordered_map>
-#include <vector>
-
-#include <lldb/API/LLDB.h>
-#include <lldb/API/SBUnixSignals.h>
-
-using namespace kcov;
-using namespace lldb;
-
-extern char **environ;
-
-class LLDBEngine : public IEngine, public IFileParser
-{
-public:
-	LLDBEngine() :
-		m_listener(NULL),
-		m_useLLDBBreakpoints(true),
-		m_filter(NULL)
-	{
-		SBDebugger::Initialize();
-		m_debugger = SBDebugger::Create();
-
-		m_debugger.SetAsync(false);
-		IParserManager::getInstance().registerParser(*this);
-	}
-
-	virtual ~LLDBEngine()
-	{
-		SBDebugger::Destroy(m_debugger);
-	}
-
-	// From IEngine
-	virtual int registerBreakpoint(unsigned long addr)
-	{
-		if (m_useLLDBBreakpoints) {
-			SBBreakpoint bp = m_target.BreakpointCreateByAddress(addr);
-
-			if (!bp.IsValid())
-				return -1;
-
-			return bp.GetID();
-		}
-
-		// Use raw writes, faster but x86-only
-		int data;
-
-		// There already?
-		if (m_instructionMap.find(addr) != m_instructionMap.end())
-			return 0;
-
-		data = peekByte(addr);
-		m_instructionMap[addr] = data;
-		pokeByte(addr, 0xcc);
-
-		return m_instructionMap.size();
-	}
-
-
-	// From IFileParser
-	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
-	{
-		m_filename = filename;
-
-		// This now assumes we have only one file, i.e., no shared libraries
-//		m_target = m_debugger.CreateTarget(m_filename.c_str());
-		SBError error;
-		m_target = m_debugger.CreateTarget(m_filename.c_str(), NULL, NULL, true, error);
-
-		if (!m_target.IsValid())
-			return false;
-
-
-		for (FileListenerList_t::const_iterator it = m_fileListeners.begin();
-				it != m_fileListeners.end();
-				++it)
-			(*it)->onFile(File(m_filename, IFileParser::FLG_NONE));
-
-		return true;
-	}
-
-	virtual bool setMainFileRelocation(unsigned long relocation)
-	{
-		return true;
-	}
-
-	virtual void registerLineListener(ILineListener &listener)
-	{
-		m_lineListeners.push_back(&listener);
-	}
-
-	virtual void registerFileListener(IFileListener &listener)
-	{
-		m_fileListeners.push_back(&listener);
-	}
-
-	virtual bool parse()
-	{
-		// Parse the file/line -> address mappings
-		for (uint32_t i = 0; i < m_target.GetNumModules(); i++)
-		{
-			SBModule cur = m_target.GetModuleAtIndex(i);
-
-			if (!cur.IsValid())
-				continue;
-
-			// Have we already parsed this module?
-			auto fs = cur.GetFileSpec();
-			if (!fs.IsValid())
-				continue;
-
-			std::string key = fmt("%s/%s", fs.GetDirectory(), fs.GetFilename());
-
-			if (m_parsedModules[key])
-			{
-				continue;
-			}
-
-			m_parsedModules[key] = true;
-
-			// Skip this big and unneeded module
-			if (key == "/usr/lib/dyld")
-			{
-				continue;
-			}
-
-			handleModule(cur);
-		}
-
-		return true;
-	}
-
-	virtual uint64_t getChecksum()
-	{
-		return 0;
-	}
-
-	virtual enum IFileParser::PossibleHits maxPossibleHits()
-	{
-		return IFileParser::HITS_LIMITED;
-	}
-
-	virtual void setupParser(IFilter *filter)
-	{
-		m_filter = filter;
-	}
-
-	std::string getParserType()
-	{
-		return "lldb";
-	}
-
-	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		return 1;
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		char buf[MAXPATHLEN + 1];
-		SBError error;
-		SBListener l;
-
-		IConfiguration &conf = IConfiguration::getInstance();
-
-
-		m_listener = &listener;
-
-		if (!getcwd(buf, sizeof(buf))) {
-			error("No current WD?\n");
-
-			return false;
-		}
-
-		// Configurable via the command line
-		m_useLLDBBreakpoints = !conf.keyAsInt("lldb-use-raw-breakpoint-writes");
-
-		unsigned int pid = conf.keyAsInt("attach-pid");
-
-		if (pid != 0) {
-			m_process = m_target.AttachToProcessWithID(l, (lldb::pid_t)pid, error);
-		} else {
-			// Launch process
-			m_process = m_target.Launch(l,
-					&IConfiguration::getInstance().getArgv()[1], // Minus the executable
-					(const char **)environ,
-					"/dev/stdin",
-					"/dev/stdout",
-					"/dev/stderr",
-					buf,
-					eLaunchFlagDisableASLR, // We can then use file addresses
-					true, // Stop at entry point
-					error);
-		}
-
-		if (!m_process.IsValid()) {
-			error("Cannot launch process: %s\n", error.GetCString());
-
-			return false;
-		}
-
-		if (error.Fail()) {
-			error("Launch failure\n");
-
-			return false;
-		}
-
-		// Special-case fork to workaround LLDB lack of follow-fork-mode
-		m_forkBreakpoint = m_target.BreakpointCreateByName("fork");
-
-		// Where the parent returns to after fork
-		if (!m_forkBreakpoint.IsValid())
-			warning("Can't set breakpoint at fork\n");
-
-		// Send all signals to the process
-		SBUnixSignals sigs = m_process.GetUnixSignals();
-		for (unsigned int i = SIGHUP; i < SIGUSR2; i++) {
-			sigs.SetShouldNotify(i, false);
-			sigs.SetShouldStop(i, true);
-			sigs.SetShouldSuppress(i, false);
-		}
-
-		return true;
-	}
-
-	bool continueExecution()
-	{
-		StateType state = m_process.GetState();
-		Event ev;
-
-		// If shared libraries has been added, parse again
-		if (m_target.GetNumModules() != m_parsedModules.size())
-		{
-			parse();
-		}
-
-		kcov_debug(BP_MSG, "STOPPED in state %d\n", state);
-
-		switch (state)
-		{
-			case eStateStopped:
-			{
-				ev = handleStop();
-			} break;
-
-			case eStateExited:
-			{
-				ev = Event(ev_exit, m_process.GetExitStatus());
-			} break;
-
-			default:
-				break;
-		}
-
-		m_listener->onEvent(ev);
-
-		// Don't continue on exit (saves a lot of execution time)
-		if (ev.type == ev_exit)
-			return false;
-
-		SBError err = m_process.Continue();
-
-		return err.Success();
-	}
-
-	Event handleStop()
-	{
-		SBThread curThread = m_process.GetSelectedThread();
-		SBFrame frame = curThread.GetSelectedFrame();
-
-		enum StopReason stopReason = curThread.GetStopReason();
-		unsigned long address = getAddress(frame.GetPCAddress());
-
-		switch (stopReason)
-		{
-			case eStopReasonSignal:
-			{
-				int signo = (int)curThread.GetStopReasonDataAtIndex(0);
-				enum event_type type = ev_signal;
-
-				if (signo == SIGSEGV || signo == SIGABRT)
-					type = ev_signal_exit;
-
-				return Event(type, signo, address);
-
-			} break;
-			case eStopReasonBreakpoint:
-			{
-				uint64_t id = curThread.GetStopReasonDataAtIndex(0);
-
-				/*
-				 * Special case for forks (OSX-specific):
-				 *
-				 * 1. Disable all breakpoints so that the child doesn't stop on INT3
-				 * 2. Set a temporary breakpoint in the parent fork return location
-				 * 3. Continue to this point. We have now started the child and are back in the parent.
-				 * 4. Enable all breakpoints again
-				 *
-				 */
-				if (m_forkBreakpoint.IsValid() && id == m_forkBreakpoint.GetID()) {
-					m_target.DisableAllBreakpoints();
-
-					SBBreakpoint inParent = m_target.BreakpointCreateByName("libSystem_atfork_parent");
-					if (inParent.IsValid()) {
-						m_process.Continue();
-						m_target.BreakpointDelete(inParent.GetID());
-					}
-
-					m_target.EnableAllBreakpoints();
-				} else {
-					m_target.BreakpointDelete(id);
-				}
-			} break;
-			case eStopReasonException:
-			{
-				uint64_t id = curThread.GetStopReasonDataAtIndex(0);
-
-				// Remove breakpoint by restoring the instruction again
-				address--;
-				InstructionMap_t::iterator it = m_instructionMap.find(address);
-
-				if (id == 6 && it != m_instructionMap.end()) {
-					pokeByte(address, m_instructionMap[address]);
-					frame.SetPC(address);
-				} else {
-					// Can't find this breakpoint or unknown exception type?
-					return Event(ev_error, -1, address);
-				}
-			} break;
-
-			default:
-				kcov_debug(BP_MSG, "Unknown stop reason %d\n", stopReason);
-				break;
-		}
-
-		return Event(ev_breakpoint, -1, address);
-	}
-
-
-	void kill(int signal)
-	{
-		m_process.Signal(signal);
-	}
-
-
-private:
-	int peekByte(unsigned long addr)
-	{
-		SBError error;
-		uint8_t out;
-
-		if (m_target.ReadMemory(SBAddress(addr, m_target), &out, sizeof(out), error) != sizeof(out))
-			return -1;
-
-		return out;
-	}
-
-	bool pokeByte(unsigned long addr, uint8_t data)
-	{
-		SBError error;
-
-		return m_process.WriteMemory(addr, &data, sizeof(data), error) == sizeof(data);
-	}
-
-	unsigned long getAddress(const SBAddress &addr) const
-	{
-		return addr.GetLoadAddress(m_target);
-	}
-
-	void handleModule(SBModule &module)
-	{
-		for (uint32_t i = 0; i < module.GetNumCompileUnits(); i++)
-		{
-			SBCompileUnit cu = module.GetCompileUnitAtIndex(i);
-
-			if (!cu.IsValid())
-				continue;
-
-			handleCompileUnit(module, cu);
-		}
-	}
-
-	// The file:line -> address mappings are in the compile units
-	void handleCompileUnit(SBModule &module, SBCompileUnit &cu)
-	{
-		for (uint32_t i = 0; i < cu.GetNumLineEntries(); i++)
-		{
-			SBLineEntry cur = cu.GetLineEntryAtIndex(i);
-
-			if (!cur.IsValid())
-				continue;
-
-			// Filename
-			SBFileSpec fs = cur.GetFileSpec();
-			if (!fs.IsValid())
-				continue;
-
-			// The address where the program is at
-			SBAddress addr = cur.GetStartAddress();
-
-			std::string filename = fmt("%s/%s", fs.GetDirectory(), fs.GetFilename());
-
-			std::string rp = m_filter->mangleSourcePath(filename);
-
-			for (LineListenerList_t::const_iterator lit = m_lineListeners.begin();
-				lit != m_lineListeners.end();
-				++lit)
-				(*lit)->onLine(rp, cur.GetLine(), getAddress(addr));
-		}
-
-	}
-
-	typedef std::vector<ILineListener *> LineListenerList_t;
-	typedef std::vector<IFileListener *> FileListenerList_t;
-	typedef std::unordered_map<unsigned long, unsigned long > InstructionMap_t;
-
-	std::string m_filename;
-
-	LineListenerList_t m_lineListeners;
-	FileListenerList_t m_fileListeners;
-
-	IEventListener *m_listener;
-	SBDebugger m_debugger;
-	SBTarget m_target;
-	SBProcess m_process;
-	SBBreakpoint m_forkBreakpoint;
-
-	InstructionMap_t m_instructionMap;
-	bool m_useLLDBBreakpoints;
-
-	IFilter *m_filter;
-
-
-	std::unordered_map<std::string, bool> m_parsedModules;
-};
-
-
-
-// This ugly stuff was inherited from bashEngine
-static LLDBEngine *g_lldbEngine;
-class LLDBCtor
-{
-public:
-	LLDBCtor()
-	{
-		g_lldbEngine = new LLDBEngine();
-	}
-};
-static LLDBCtor g_bashCtor;
-
-
-class LLDBEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~LLDBEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return g_lldbEngine;
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		// Unless #!/bin/sh etc, this should win
-		return 1;
-	}
-};
-
-static LLDBEngineCreator g_lldbEngineCreator;
diff --git a/kcov-38/src/engines/ptrace.cc b/kcov-38/src/engines/ptrace.cc
deleted file mode 100644
index b702e8d53450..000000000000
--- a/kcov-38/src/engines/ptrace.cc
+++ /dev/null
@@ -1,471 +0,0 @@
-#include <sys/types.h>
-
-#include <engine.hh>
-#include <utils.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <solib-handler.hh>
-#include <file-parser.hh>
-#include <phdr_data.h>
-#include "ptrace_sys.hh"
-
-#include <sys/wait.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <mutex>
-#include <vector>
-
-using namespace kcov;
-
-#define str(s) #s
-#define xstr(s) str(s)
-
-static unsigned long getAligned(unsigned long addr)
-{
-	return (addr / sizeof(unsigned long)) * sizeof(unsigned long);
-}
-
-static unsigned long arch_setupBreakpoint(unsigned long addr, unsigned long old_data)
-{
-	unsigned long val;
-
-#if defined(__i386__) || defined(__x86_64__)
-	unsigned long aligned_addr = getAligned(addr);
-	unsigned long offs = addr - aligned_addr;
-	unsigned long shift = 8 * offs;
-
-	val = (old_data & ~(0xffUL << shift)) | (0xccUL << shift);
-#elif defined(__powerpc__)
-	val = 0x7fe00008; /* tw */
-#elif defined(__arm__)
-	val = 0xfedeffe7; // Undefined insn
-#elif defined(__aarch64__)
-	unsigned long aligned_addr = getAligned(addr);
-	unsigned long offs = addr - aligned_addr;
-	unsigned long shift = 8 * offs;
-
-	val = (old_data & ~(0xffffffffUL << shift)) | (0xd4200000UL << shift);
-#else
-# error Unsupported architecture
-#endif
-
-	return val;
-}
-
-static unsigned long arch_clearBreakpoint(unsigned long addr, unsigned long old_data, unsigned long cur_data)
-{
-	unsigned long val;
-#if defined(__i386__) || defined(__x86_64__)
-	unsigned long aligned_addr = getAligned(addr);
-	unsigned long offs = addr - aligned_addr;
-	unsigned long shift = 8 * offs;
-	unsigned long old_byte = (old_data >> shift) & 0xffUL;
-
-	val = (cur_data & ~(0xffUL << shift)) | (old_byte << shift);
-#else
-	val = old_data;
-#endif
-
-	return val;
-}
-
-class Ptrace : public IEngine
-{
-public:
-	Ptrace() : m_firstBreakpoint(true), m_activeChild(0), m_child(0), m_firstChild(0),
-		m_parentCpu(0), m_listener(NULL), m_signal(0)
-	{
-	}
-
-	~Ptrace()
-	{
-		kill(SIGTERM);
-		ptrace_sys::detach(m_activeChild);
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		m_listener = &listener;
-
-		m_parentCpu = ptrace_sys::get_current_cpu();
-		ptrace_sys::tie_process_to_cpu(getpid(), m_parentCpu);
-
-		m_instructionMap.clear();
-
-		/* Basic check first */
-		if (access(executable.c_str(), X_OK) != 0)
-			return false;
-
-		unsigned int pid = IConfiguration::getInstance().keyAsInt("attach-pid");
-		bool res = false;
-
-		if (pid != 0)
-			res = attachPid(pid);
-		else
-			res = forkChild(executable.c_str());
-
-		return res;
-	}
-
-	int registerBreakpoint(unsigned long addr)
-	{
-		if (addr == 0)
-			return -1;
-
-		unsigned long data;
-
-		// There already?
-		if (m_instructionMap.find(addr) != m_instructionMap.end())
-			return 0;
-
-		data = ptrace_sys::peekWord(m_activeChild, getAligned(addr));
-
-		m_instructionMap[addr] = data;
-		m_pendingBreakpoints.push_back(addr);
-
-		kcov_debug(BP_MSG, "BP registered at 0x%lx\n", addr);
-
-		return 0;
-	}
-
-	bool clearBreakpoint(unsigned long addr)
-	{
-		if (m_instructionMap.find(addr) == m_instructionMap.end())
-		{
-			kcov_debug(BP_MSG, "Can't find breakpoint at 0x%lx\n", addr);
-
-			// Stupid workaround for avoiding the solib thread race
-			msleep(1);
-
-			return false;
-		}
-
-		// Clear the actual breakpoint instruction
-		unsigned long val = m_instructionMap[addr];
-		val = arch_clearBreakpoint(addr, val, ptrace_sys::peekWord(m_activeChild, getAligned(addr)));
-
-		ptrace_sys::pokeWord(m_activeChild, getAligned(addr), val);
-
-		return true;
-	}
-
-	const Event waitEvent()
-	{
-		static uint64_t lastSignalAddress;
-		Event out;
-		int status;
-		pid_t who;
-
-		// Assume error
-		out.type = ev_error;
-		out.data = -1;
-
-		who = ptrace_sys::wait_all(&status);
-
-		if (who == -1)
-		{
-			kcov_debug(ENGINE_MSG, "Returning error\n");
-			return out;
-		}
-
-		m_children[who] = 1;
-
-		m_activeChild = who;
-		out.addr = ptrace_sys::getPc(m_activeChild);
-
-		kcov_debug(ENGINE_MSG, "PT stopped PID %d 0x%08x\n", m_activeChild, status);
-
-		// A signal?
-		if (WIFSTOPPED(status))
-		{
-			int sig = WSTOPSIG(status);
-			int sigill = SIGSYS;
-
-			// Arm is using an undefined instruction, so we'll get a SIGILL here
-#if defined(__arm__) || defined(__aarch64__)
-			sigill = SIGILL;
-#endif
-
-			out.type = ev_signal;
-			out.data = sig;
-			int event = ptrace_sys::getEvent(who, status);
-			if (ptrace_sys::eventIsNewChild(sig, event))
-			{
-				// Activate tracing on a new child
-				kcov_debug(ENGINE_MSG, "PT new child %d\n", m_activeChild);
-				ptrace_sys::follow_child(m_activeChild);
-				out.data = 0;
-			}
-			else if (ptrace_sys::eventIsForky(sig, event))
-			{
-				kcov_debug(ENGINE_MSG, "PT fork/clone at 0x%llx for %d\n", (unsigned long long) out.addr, m_activeChild);
-				out.data = 0;
-			}
-			else if (sig == SIGTRAP || sig == SIGSTOP || sig == sigill)
-			{
-				// A trap?
-				out.type = ev_breakpoint;
-				out.data = -1;
-
-				kcov_debug(ENGINE_MSG, "PT BP at 0x%llx:%d for %d\n", (unsigned long long) out.addr, out.data,
-						m_activeChild);
-
-				kcov_debug(ENGINE_MSG, "Looking for instruction %zx.\n", out.addr);
-				bool insnFound = m_instructionMap.find(out.addr) != m_instructionMap.end();
-
-				// Single-step if we have this BP
-				if (insnFound)
-					ptrace_sys::singleStep(m_activeChild);
-				else if (sig != SIGSTOP)
-					ptrace_sys::skipInstruction(m_activeChild);
-
-				// Wait for solib data if this is the first time
-				if (m_firstBreakpoint && insnFound)
-				{
-					blockUntilSolibDataRead();
-					m_firstBreakpoint = false;
-				}
-
-				return out;
-			}
-
-			kcov_debug(ENGINE_MSG, "PT signal %d at 0x%llx for %d\n", WSTOPSIG(status), (unsigned long long) out.addr,
-					m_activeChild);
-			lastSignalAddress = out.addr;
-		}
-		else if (WIFSIGNALED(status))
-		{
-			// Crashed/killed
-			int sig = WTERMSIG(status);
-
-			out.type = ev_signal;
-			out.data = sig;
-			out.addr = lastSignalAddress;
-
-			kcov_debug(ENGINE_MSG, "PT terminating signal %d at 0x%llx for %d\n", sig, (unsigned long long) out.addr,
-					m_activeChild);
-			m_children.erase(who);
-
-			if (!childrenLeft())
-				out.type = ev_signal_exit;
-
-		}
-		else if (WIFEXITED(status))
-		{
-			int exitStatus = WEXITSTATUS(status);
-
-			kcov_debug(ENGINE_MSG, "PT exit %d at 0x%llx for %d%s\n", exitStatus, (unsigned long long) out.addr,
-					m_activeChild, m_activeChild == m_firstChild ? " (first child)" : "");
-
-			m_children.erase(who);
-
-			if (who == m_firstChild)
-				out.type = ev_exit_first_process;
-			else
-				out.type = ev_exit;
-
-			out.data = exitStatus;
-		}
-
-		return out;
-	}
-
-	bool childrenLeft()
-	{
-		return m_children.size() > 0 && m_children.find(m_firstChild) != m_children.end();
-	}
-
-	/**
-	 * Continue execution with an event
-	 */
-	bool continueExecution()
-	{
-		int res;
-
-		setupAllBreakpoints();
-
-		kcov_debug(ENGINE_MSG, "PT continuing %d with signal %d\n", m_activeChild, m_signal);
-		res = ptrace_sys::cont(m_activeChild, m_signal);
-		if (res < 0)
-		{
-			kcov_debug(ENGINE_MSG, "PT error for %d: %d\n", m_activeChild, res);
-			m_children.erase(m_activeChild);
-		}
-
-		Event ev = waitEvent();
-		m_signal = ev.type == ev_signal ? ev.data : 0;
-
-		if (m_listener)
-			m_listener->onEvent(ev);
-
-		if (ev.type == ev_breakpoint)
-			clearBreakpoint(ev.addr);
-
-		if (ev.type == ev_error)
-			return false;
-
-		return true;
-	}
-
-	void kill(int signal)
-	{
-		// Don't kill kcov itself (PID 0)
-		if (m_activeChild != 0)
-			::kill(m_activeChild, signal);
-	}
-
-private:
-
-	void setupAllBreakpoints()
-	{
-		for (PendingBreakpointList_t::const_iterator addrIt = m_pendingBreakpoints.begin();
-				addrIt != m_pendingBreakpoints.end(); ++addrIt)
-		{
-			unsigned long addr = *addrIt;
-			unsigned long cur_data = ptrace_sys::peekWord(m_activeChild, getAligned(addr));
-
-			// Set the breakpoint
-			ptrace_sys::pokeWord(m_activeChild, getAligned(addr), arch_setupBreakpoint(addr, cur_data));
-		}
-
-		m_pendingBreakpoints.clear();
-	}
-
-	bool forkChild(const char *executable)
-	{
-		char * const *argv = (char * const *) IConfiguration::getInstance().getArgv();
-		pid_t child, who;
-		int status;
-
-		/* Executable exists, try to launch it */
-		if ((child = fork()) == 0)
-		{
-			int res;
-
-			/* Avoid address randomization */
-			if (!ptrace_sys::disable_aslr())
-				return false;
-
-			/* And launch the process */
-			res = ptrace_sys::trace_me();
-			if (res < 0)
-			{
-				perror("Can't set me as ptraced");
-				return false;
-			}
-			ptrace_sys::tie_process_to_cpu(getpid(), m_parentCpu);
-			execv(executable, argv);
-
-			/* Exec failed */
-			return false;
-		}
-
-		/* Fork error? */
-		if (child < 0)
-		{
-			perror("fork");
-			return false;
-		}
-		m_child = m_activeChild = m_firstChild = child;
-		// Might not be completely necessary (the child should inherit this
-		// from the parent), but better safe than sorry
-		ptrace_sys::tie_process_to_cpu(m_child, m_parentCpu);
-
-		kcov_debug(ENGINE_MSG, "PT forked %d\n", child);
-
-		/* Wait for the initial stop */
-		who = waitpid(child, &status, 0);
-		if (who < 0)
-		{
-			perror("waitpid");
-			return false;
-		}
-		if (!WIFSTOPPED(status))
-		{
-			fprintf(stderr, "Child hasn't stopped: %x\n", status);
-			return false;
-		}
-
-		ptrace_sys::follow_fork(m_activeChild);
-
-		return true;
-	}
-
-	bool attachPid(pid_t pid)
-	{
-		int rv;
-
-		m_child = m_activeChild = m_firstChild = pid;
-
-		errno = 0;
-		rv = ptrace_sys::attachAll(m_activeChild);
-		//rv = ptrace(PTRACE_ATTACH, m_activeChild, 0, 0);
-		if (rv < 0)
-		{
-			const char *err = strerror(errno);
-
-			fprintf(stderr, "Can't attach to %d. Error %s\n", pid, err);
-			return false;
-		}
-
-		/* Wait for the initial stop */
-		int status;
-		int who = waitpid(m_activeChild, &status, 0);
-		if (who < 0)
-		{
-			perror("waitpid");
-			return false;
-		}
-		if (!WIFSTOPPED(status))
-		{
-			fprintf(stderr, "Child hasn't stopped: %x\n", status);
-			return false;
-		}
-		ptrace_sys::tie_process_to_cpu(m_activeChild, m_parentCpu);
-
-		return true;
-	}
-
-	typedef std::unordered_map<unsigned long, unsigned long> instructionMap_t;
-	typedef std::vector<unsigned long> PendingBreakpointList_t;
-	typedef std::unordered_map<pid_t, int> ChildMap_t;
-
-	instructionMap_t m_instructionMap;
-	PendingBreakpointList_t m_pendingBreakpoints;
-	bool m_firstBreakpoint;
-
-	pid_t m_activeChild;
-	pid_t m_child;
-	pid_t m_firstChild;
-	ChildMap_t m_children;
-
-	int m_parentCpu;
-
-	IEventListener *m_listener;
-	int m_signal;
-};
-
-class PtraceEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~PtraceEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return new Ptrace();
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		// Unless #!/bin/sh etc, this should win
-		return 1;
-	}
-};
-
-static PtraceEngineCreator g_ptraceEngineCreator;
diff --git a/kcov-38/src/engines/ptrace_freebsd.cc b/kcov-38/src/engines/ptrace_freebsd.cc
deleted file mode 100644
index a200fb504a38..000000000000
--- a/kcov-38/src/engines/ptrace_freebsd.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <sys/wait.h>
-
-#include <errno.h>
-
-#include "ptrace_sys.hh"
-
-static void arch_adjustPcAfterBreakpoint(struct reg *regs);
-unsigned long arch_getPcFromRegs(struct reg *regs);
-static unsigned long getPcFromRegs(struct reg *regs);
-static long getRegs(pid_t pid, void *addr, struct reg *regs);
-static long setRegs(pid_t pid, void *addr, struct reg *regs);
-
-
-static void
-arch_adjustPcAfterBreakpoint(struct reg *regs)
-{
-#if defined(__x86_64__)
-	regs->r_rip--;
-#else
-# error Unsupported architecture
-#endif
-}
-
-unsigned long arch_getPcFromRegs(struct reg *regs)
-{
-#if defined(__x86_64__)
-	return(regs->r_rip) - 1;
-#else
-# error Unsupported architecture
-#endif
-}
-
-int
-ptrace_sys::attachAll (pid_t pid)
-{
-	return (ptrace(PT_ATTACH, pid, 0, 0) < 0 ? errno: 0);
-}
-
-int
-ptrace_sys::cont(pid_t pid, int signal)
-{
-	return ptrace(PT_CONTINUE, pid, (caddr_t)1, signal);
-}
-
-void
-ptrace_sys::detach(pid_t pid)
-{
-	ptrace(PT_DETACH, pid, 0, 0);
-}
-
-bool
-ptrace_sys::disable_aslr(void)
-{
-	return true;
-}
-
-bool
-ptrace_sys::eventIsForky(int signal, int event)
-{
-	return (signal == SIGTRAP && (event & PL_FLAG_FORKED));
-}
-
-bool
-ptrace_sys::eventIsNewChild(int signal, int event)
-{
-	return (signal == SIGSTOP && (event & PL_FLAG_CHILD));
-}
-
-int
-ptrace_sys::follow_child(pid_t pid)
-{
-	return ptrace_sys::follow_fork(pid);
-}
-
-int
-ptrace_sys::follow_fork(pid_t pid)
-{
-	return ptrace(PT_FOLLOW_FORK, pid, NULL, 1);
-}
-
-int
-ptrace_sys::getEvent(pid_t pid, int status)
-{
-	struct ptrace_lwpinfo lwpinfo;
-	ptrace(PT_LWPINFO, pid, (caddr_t)&lwpinfo, sizeof(lwpinfo));
-	return (lwpinfo.pl_flags);
-}
-
-unsigned long
-ptrace_sys::getPc(int pid)
-{
-	struct reg regs;
-	getRegs(pid, NULL, &regs);
-	return getPcFromRegs(&regs);
-}
-
-int
-ptrace_sys::get_current_cpu(void)
-{
-	return 0;
-}
-
-static unsigned long
-getPcFromRegs(struct reg *regs)
-{
-	return arch_getPcFromRegs(regs);
-}
-
-static long
-getRegs(pid_t pid, void *addr, struct reg *regs)
-{
-	return ptrace(PT_GETREGS, pid, (caddr_t)regs, 0);
-}
-
-unsigned long
-ptrace_sys::peekWord(pid_t pid, unsigned long aligned_addr)
-{
-	unsigned long val;
-
-	struct ptrace_io_desc ptiod =
-	{
-		.piod_op = PIOD_READ_I,
-		.piod_offs = (void*)aligned_addr,
-		.piod_addr = &val,
-		.piod_len = sizeof(val)
-	};
-	ptrace(PT_IO, pid, (caddr_t)&ptiod, 0);
-	return val;
-}
-
-void
-ptrace_sys::pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value)
-{
-	struct ptrace_io_desc ptiod =
-	{
-		.piod_op = PIOD_WRITE_I,
-		.piod_offs = (void*)aligned_addr,
-		.piod_addr = &value,
-		.piod_len = sizeof(value)
-	};
-	ptrace(PT_IO, pid, (caddr_t)&ptiod, 0);
-}
-
-static long
-setRegs(pid_t pid, void *addr, struct reg *regs)
-{
-	return ptrace(PT_SETREGS, pid, (caddr_t)regs, 0);
-}
-
-void
-ptrace_sys::singleStep(pid_t pid)
-{
-	// Step back one instruction
-	struct reg regs;
-	getRegs(pid, NULL, &regs);
-	arch_adjustPcAfterBreakpoint(&regs);
-	setRegs(pid, NULL, &regs);
-}
-
-// Skip over this instruction
-void
-ptrace_sys::skipInstruction(pid_t pid)
-{
-	// Nop on x86 and x86_64
-}
-
-void
-ptrace_sys::tie_process_to_cpu(pid_t pid, int cpu)
-{
-}
-
-int
-ptrace_sys::trace_me(void)
-{
-	return ptrace(PT_TRACE_ME, 0, 0, 0);
-}
-
-pid_t
-ptrace_sys::wait_all(int *status)
-{
-	return waitpid(-1, status, WSTOPPED);
-}
diff --git a/kcov-38/src/engines/ptrace_linux.cc b/kcov-38/src/engines/ptrace_linux.cc
deleted file mode 100644
index bd25d0efef52..000000000000
--- a/kcov-38/src/engines/ptrace_linux.cc
+++ /dev/null
@@ -1,430 +0,0 @@
-#include <sys/types.h>
-#include <sys/personality.h>
-#include <sys/ptrace.h>
-#include <sys/wait.h>
-
-#if defined(__aarch64__)
-#  include <sys/uio.h>
-#  include <elf.h>
-#endif
-
-#include <dirent.h>
-#include <sched.h>
-#include <stdio.h>
-#include <string.h>
-#include <unordered_map>
-
-#include "ptrace_sys.hh"
-#include "utils.hh"
-
-enum
-{
-	i386_EIP = 12, x86_64_RIP = 16, ppc_NIP = 32, arm_PC = 15, aarch64_PC = 32, // See Linux arch/arm64/include/asm/ptrace.h
-};
-
-static void arch_adjustPcAfterBreakpoint(unsigned long *regs);
-static unsigned long arch_getPcFromRegs(unsigned long *regs);
-static int attachLwp(int lwpid);
-static unsigned long getPcFromRegs(unsigned long *regs);
-static long getRegs(pid_t pid, void *addr, void *regs, size_t len);
-static int kill_lwp(unsigned long lwpid, int signo);
-static int linux_proc_get_int(pid_t lwpid, const char *field);
-static int linux_proc_pid_has_state(pid_t pid, const char *state);
-static int linux_proc_pid_is_stopped(pid_t pid);
-static int linux_proc_get_tgid(pid_t lwpid);
-static long setRegs(pid_t pid, void *addr, void *regs, size_t len);
-
-static void arch_adjustPcAfterBreakpoint(unsigned long *regs)
-{
-#if defined(__i386__)
-	regs[i386_EIP]--;
-#elif defined(__x86_64__)
-	regs[x86_64_RIP]--;
-#elif defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)
-	// Do nothing
-#else
-# error Unsupported architecture
-#endif
-}
-
-static unsigned long arch_getPcFromRegs(unsigned long *regs)
-{
-	unsigned long out;
-
-#if defined(__i386__)
-	out = regs[i386_EIP] - 1;
-#elif defined(__x86_64__)
-	out = regs[x86_64_RIP] - 1;
-#elif defined(__arm__)
-	out = regs[arm_PC];
-#elif defined(__aarch64__)
-	out = regs[aarch64_PC];
-#elif defined(__powerpc__)
-	out = regs[ppc_NIP];
-#else
-# error Unsupported architecture
-#endif
-
-	return out;
-}
-
-int ptrace_sys::attachAll(pid_t pid)
-{
-	int err;
-
-	/* Attach to PID.  We will check for other threads soon. */
-	err = attachLwp(pid);
-	if (err != 0)
-		error("Cannot attach to process %d\n", pid);
-
-	if (linux_proc_get_tgid(pid) != pid)
-	{
-		return 0;
-	}
-
-	DIR *dir;
-	char pathname[128];
-
-	sprintf(pathname, "/proc/%d/task", pid);
-
-	dir = opendir(pathname);
-
-	if (!dir)
-	{
-		error("Could not open /proc/%d/task.\n", pid);
-
-		return 0;
-	}
-
-	/* At this point we attached to the tgid.  Scan the task for
-	 * existing threads. */
-	int new_threads_found;
-	int iterations = 0;
-
-	std::unordered_map<unsigned long, bool> threads;
-	threads[pid] = true;
-
-	while (iterations < 2)
-	{
-		struct dirent *dp;
-
-		new_threads_found = 0;
-		/* Add all the other threads.  While we go through the
-		 * threads, new threads may be spawned.  Cycle through
-		 * the list of threads until we have done two iterations without
-		 * finding new threads.  */
-		while ((dp = readdir(dir)) != NULL)
-		{
-			int lwp;
-
-			/* Fetch one lwp.  */
-			lwp = strtoul(dp->d_name, NULL, 10);
-
-			/* Is this a new thread?  */
-			if (lwp != 0 && threads.find(lwp) == threads.end())
-			{
-				int err;
-				threads[lwp] = true;
-
-				err = attachLwp(lwp);
-				if (err != 0)
-					warning("Cannot attach to lwp %d\n", lwp);
-
-				new_threads_found++;
-			}
-		}
-
-		if (!new_threads_found)
-			iterations++;
-		else
-			iterations = 0;
-
-		rewinddir(dir);
-	}
-	closedir(dir);
-
-	return 0;
-}
-
-/* Attach to an inferior process. */
-static int attachLwp(int lwpid)
-{
-	int rv;
-
-	rv = ptrace(PTRACE_ATTACH, lwpid, 0, 0);
-
-	if (rv < 0)
-		return errno;
-	ptrace(PTRACE_SETOPTIONS, lwpid, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK);
-
-	if (!linux_proc_pid_is_stopped(lwpid))
-	{
-		/*
-		 * First make sure there is a pending SIGSTOP.  Since we are
-		 * already attached, the process can not transition from stopped
-		 * to running without a PTRACE_CONT; so we know this signal will
-		 * go into the queue.  The SIGSTOP generated by PTRACE_ATTACH is
-		 * probably already in the queue (unless this kernel is old
-		 * enough to use TASK_STOPPED for ptrace stops); but since
-		 * SIGSTOP is not an RT signal, it can only be queued once.  */
-		kill_lwp(lwpid, SIGSTOP);
-	}
-
-	return 0;
-}
-
-int ptrace_sys::cont(pid_t pid, int signal)
-{
-	return ptrace(PTRACE_CONT, pid, 0, signal);
-}
-
-void ptrace_sys::detach(pid_t pid)
-{
-	ptrace(PTRACE_DETACH, pid, 0, 0);
-}
-
-bool ptrace_sys::disable_aslr(void)
-{
-	int persona = personality(0xffffffff);
-	if (persona < 0)
-	{
-		perror("Can't get personality");
-		return false;
-	}
-	persona |= 0x0040000; /* ADDR_NO_RANDOMIZE */
-	if (personality(persona) < 0)
-	{
-		perror("Can't set personality");
-		return false;
-	}
-	return true;
-}
-
-bool ptrace_sys::eventIsForky(int signal, int event)
-{
-	return (signal == SIGTRAP && (event == PTRACE_EVENT_CLONE || event == PTRACE_EVENT_FORK || event == PTRACE_EVENT_VFORK));
-}
-
-bool ptrace_sys::eventIsNewChild(int signal, int event)
-{
-	return false;
-}
-
-int ptrace_sys::follow_child(pid_t pid)
-{
-	return 0;
-}
-
-int ptrace_sys::follow_fork(pid_t pid)
-{
-	return ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK);
-}
-
-/* Return non-zero if 'State' of /proc/PID/status contains STATE.  */
-static int linux_proc_get_int(pid_t lwpid, const char *field)
-{
-	size_t field_len = strlen(field);
-	FILE *status_file;
-	char buf[100];
-	int retval = -1;
-
-	snprintf(buf, sizeof(buf), "/proc/%d/status", (int) lwpid);
-	status_file = fopen(buf, "r");
-	if (status_file == NULL)
-	{
-		warning("unable to open /proc file '%s'", buf);
-		return -1;
-	}
-
-	while (fgets(buf, sizeof(buf), status_file))
-	{
-		if (strncmp(buf, field, field_len) == 0 && buf[field_len] == ':')
-		{
-			retval = (int) strtol(&buf[field_len + 1], NULL, 10);
-			break;
-		}
-	}
-
-	fclose(status_file);
-
-	return retval;
-}
-
-static int linux_proc_pid_has_state(pid_t pid, const char *state)
-{
-	char buffer[100];
-	FILE *procfile;
-	int retval;
-	int have_state;
-
-	xsnprintf(buffer, sizeof(buffer), "/proc/%d/status", (int ) pid);
-	procfile = fopen(buffer, "r");
-	if (procfile == NULL)
-	{
-		warning("unable to open /proc file '%s'", buffer);
-		return 0;
-	}
-
-	have_state = 0;
-	while (fgets(buffer, sizeof(buffer), procfile) != NULL)
-	{
-		if (strncmp(buffer, "State:", 6) == 0)
-		{
-			have_state = 1;
-			break;
-		}
-	}
-	retval = (have_state && strstr(buffer, state) != NULL);
-	fclose(procfile);
-	return retval;
-}
-
-/* Detect `T (stopped)' in `/proc/PID/status'.
- * Other states including `T (tracing stop)' are reported as false.
- */
-static int linux_proc_pid_is_stopped(pid_t pid)
-{
-	return linux_proc_pid_has_state(pid, "T (stopped)");
-}
-
-static int linux_proc_get_tgid(pid_t lwpid)
-{
-	return linux_proc_get_int(lwpid, "Tgid");
-}
-
-int ptrace_sys::get_current_cpu(void)
-{
-	return sched_getcpu();
-}
-
-int ptrace_sys::getEvent(pid_t pid, int status)
-{
-	return (status >> 16);
-}
-
-unsigned long ptrace_sys::getPc(int pid)
-{
-	unsigned long regs[1024];
-
-	memset(regs, 0, sizeof regs);
-	getRegs(pid, NULL, regs, sizeof regs);
-	return getPcFromRegs(regs);
-}
-
-static unsigned long getPcFromRegs(unsigned long *regs)
-{
-	return arch_getPcFromRegs(regs);
-}
-
-static long getRegs(pid_t pid, void *addr, void *regs, size_t len)
-{
-#if defined(__aarch64__)
-	struct iovec iov =
-	{	regs, len};
-	return ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov);
-#else
-	(void) len;
-	return ptrace((__ptrace_request ) PTRACE_GETREGS, pid, NULL, regs);
-#endif
-}
-
-static int kill_lwp(unsigned long lwpid, int signo)
-{
-	/* Use tkill, if possible, in case we are using nptl threads.  If tkill
-	 * fails, then we are not using nptl threads and we should be using kill. */
-
-#ifdef __NR_tkill
-	{
-		static int tkill_failed;
-
-		if (!tkill_failed)
-		{
-			int ret;
-
-			errno = 0;
-			ret = syscall (__NR_tkill, lwpid, signo);
-			if (errno != ENOSYS)
-			return ret;
-			tkill_failed = 1;
-		}
-	}
-#endif
-
-	return kill(lwpid, signo);
-}
-
-unsigned long ptrace_sys::peekWord(pid_t pid, unsigned long aligned_addr)
-{
-
-	return ptrace((__ptrace_request ) PTRACE_PEEKTEXT, pid, aligned_addr, 0);
-}
-
-void ptrace_sys::pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value)
-{
-	ptrace((__ptrace_request ) PTRACE_POKETEXT, pid, aligned_addr, value);
-}
-
-static long setRegs(pid_t pid, void *addr, void *regs, size_t len)
-{
-#if defined(__aarch64__)
-	struct iovec iov =
-	{	regs, len};
-	return ptrace(PTRACE_SETREGSET, pid, (void *)NT_PRSTATUS, &iov);
-#else
-	(void) len;
-	return ptrace((__ptrace_request ) PTRACE_SETREGS, pid, NULL, regs);
-#endif
-}
-
-void ptrace_sys::singleStep(pid_t pid)
-{
-	// Step back one instruction
-	unsigned long regs[1024];
-	getRegs(pid, NULL, regs, sizeof regs);
-	arch_adjustPcAfterBreakpoint(regs);
-	setRegs(pid, NULL, regs, sizeof regs);
-}
-
-// Skip over this instruction
-void ptrace_sys::skipInstruction(pid_t pid)
-{
-	// Nop on x86, op on PowerPC/ARM
-#if defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)
-	unsigned long regs[1024];
-
-	getRegs(pid, NULL, regs, sizeof regs);
-
-# if defined(__powerpc__)
-	regs[ppc_NIP] += 4;
-# elif defined(__aarch64__)
-	regs[aarch64_PC] += 4;
-# else
-	regs[arm_PC] += 4;
-# endif
-	setRegs(pid, NULL, regs, sizeof regs);
-#endif
-}
-
-void ptrace_sys::tie_process_to_cpu(pid_t pid, int cpu)
-{
-	// Switching CPU while running will cause icache
-	// conflicts. So let's just forbid that.
-
-	int max_cpu = 4096;
-	cpu_set_t *set = CPU_ALLOC(max_cpu);
-	panic_if(!set, "Can't allocate CPU set!\n");
-	CPU_ZERO_S(CPU_ALLOC_SIZE(max_cpu), set);
-	CPU_SET(cpu, set);
-	panic_if(sched_setaffinity(pid, CPU_ALLOC_SIZE(max_cpu), set) < 0, "Can't set CPU affinity. Coincident won't work");
-	CPU_FREE(set);
-}
-
-int ptrace_sys::trace_me(void)
-{
-	return ptrace(PTRACE_TRACEME, 0, 0, 0);
-}
-
-pid_t ptrace_sys::wait_all(int *status)
-{
-	return waitpid(-1, status, __WALL);
-}
diff --git a/kcov-38/src/engines/ptrace_sys.hh b/kcov-38/src/engines/ptrace_sys.hh
deleted file mode 100644
index 3b06c475f630..000000000000
--- a/kcov-38/src/engines/ptrace_sys.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace ptrace_sys
-{
-
-int attachAll (pid_t pid);
-int cont(pid_t pid, int signal);
-void detach(pid_t pid);
-bool disable_aslr(void);
-// Does this event relate to creating new processes or threads?
-bool eventIsForky(int signal, int event);
-// Does this event come from a newly created, traced, child?
-bool eventIsNewChild(int signal, int event);
-int follow_child(pid_t pid);
-int follow_fork(pid_t pid);
-int get_current_cpu(void);
-// Get the event that caused a trap.  The event is opaque to the caller.
-int getEvent(pid_t pid, int status);
-unsigned long getPc(int pid);
-unsigned long peekWord(pid_t pid, unsigned long aligned_addr);
-void pokeWord(pid_t pid, unsigned long aligned_addr, unsigned long value);
-void singleStep(pid_t pid);
-void skipInstruction(pid_t pid);
-void tie_process_to_cpu(pid_t pid, int cpu);
-int trace_me(void);
-int wait_all(int *status);
-
-}
diff --git a/kcov-38/src/engines/python-engine.cc b/kcov-38/src/engines/python-engine.cc
deleted file mode 100644
index 3aa5c3e4a823..000000000000
--- a/kcov-38/src/engines/python-engine.cc
+++ /dev/null
@@ -1,474 +0,0 @@
-#include <file-parser.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <lineid.hh>
-#include <utils.hh>
-#include <source-file-cache.hh>
-#include <generated-data-base.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-
-#include <list>
-#include <unordered_map>
-#include <vector>
-
-#include <swap-endian.hh>
-
-#include "script-engine-base.hh"
-
-using namespace kcov;
-
-extern GeneratedData python_helper_data;
-
-
-const uint64_t COVERAGE_MAGIC = 0x6d6574616c6c6775ULL; // "metallgut"
-
-/* Should be 8-byte aligned */
-struct coverage_data
-{
-	uint64_t magic;
-	uint32_t size;
-	uint32_t line;
-	const char filename[];
-};
-
-class PythonEngine : public ScriptEngineBase
-{
-public:
-	PythonEngine() :
-			ScriptEngineBase(), m_child(0), m_pipe(NULL)
-	{
-	}
-
-	~PythonEngine()
-	{
-		kill(SIGTERM);
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		std::string command = conf.keyAsString("python-command");
-
-		std::string kcov_python_pipe_path = IOutputHandler::getInstance().getOutDirectory() + "kcov-python.pipe";
-		std::string kcov_python_path = IOutputHandler::getInstance().getBaseDirectory() + "python-helper.py";
-
-		if (!executable_exists_in_path(command))
-		{
-			error("Cannot find Python parser '%s'", command.c_str());
-
-			return false;
-		}
-
-		if (write_file(python_helper_data.data(), python_helper_data.size(), "%s", kcov_python_path.c_str()) < 0)
-		{
-			error("Can't write python helper at %s", kcov_python_path.c_str());
-
-			return false;
-		}
-
-		m_listener = &listener;
-
-		std::string kcov_python_env = "KCOV_PYTHON_PIPE_PATH=" + kcov_python_pipe_path;
-		unlink(kcov_python_pipe_path.c_str());
-		if (mkfifo(kcov_python_pipe_path.c_str(), 0600) < 0)
-		{
-			error("Can't create python FIFO %s\n", kcov_python_pipe_path.c_str());
-
-			return false;
-		}
-
-		char *envString = (char *) xmalloc(kcov_python_env.size() + 1);
-		strcpy(envString, kcov_python_env.c_str());
-
-		putenv(envString);
-
-		/* Launch the python helper */
-		m_child = fork();
-		if (m_child == 0)
-		{
-			const char **argv = conf.getArgv();
-			unsigned int argc = conf.getArgc();
-
-			std::string s = fmt("%s %s ", command.c_str(), kcov_python_path.c_str());
-			for (unsigned int i = 0; i < argc; i++)
-				s += "'" + std::string(argv[i]) + "' ";
-
-			int res;
-
-			res = system(s.c_str());
-			panic_if(res < 0, "Can't execute python helper");
-
-			exit(WEXITSTATUS(res));
-		}
-		else if (m_child < 0)
-		{
-			perror("fork");
-
-			return false;
-		}
-		m_pipe = fopen(kcov_python_pipe_path.c_str(), "r");
-		panic_if(!m_pipe, "Can't open python pipe %s", kcov_python_pipe_path.c_str());
-
-		return true;
-	}
-
-	bool checkEvents()
-	{
-		uint8_t buf[8192];
-		struct coverage_data *p;
-
-		p = readCoverageDatum(buf, sizeof(buf));
-
-		if (!p)
-		{
-			reportEvent(ev_error, -1);
-
-			return false;
-		}
-
-		if (!m_reportedFiles[p->filename])
-		{
-			m_reportedFiles[p->filename] = true;
-
-			for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
-				(*it)->onFile(File(p->filename, IFileParser::FLG_NONE));
-
-			parseFile(p->filename);
-		}
-
-		if (m_listener)
-		{
-			uint64_t address = 0;
-			Event ev;
-
-			LineIdToAddressMap_t::const_iterator it = m_lineIdToAddress.find(getLineId(p->filename, p->line));
-			if (it != m_lineIdToAddress.end())
-				address = it->second;
-
-			ev.type = ev_breakpoint;
-			ev.addr = address;
-			ev.data = 1;
-
-			m_listener->onEvent(ev);
-		}
-
-		return true;
-	}
-
-	bool continueExecution()
-	{
-		if (checkEvents())
-			return true;
-
-		// Otherwise wait for child
-		int status;
-		int rv;
-
-		rv = waitpid(m_child, &status, WNOHANG);
-		if (rv != m_child)
-			return true;
-
-		if (WIFEXITED(status))
-		{
-			reportEvent(ev_exit_first_process, WEXITSTATUS(status));
-		}
-		else
-		{
-			warning("Other status: 0x%x\n", status);
-			reportEvent(ev_error, -1);
-		}
-
-		return false;
-	}
-
-	void kill(int signal)
-	{
-		if (m_child == 0)
-			return;
-
-		::kill(m_child, signal);
-	}
-
-	std::string getParserType()
-	{
-		return "python";
-	}
-
-	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		std::string s((const char *) data, 80);
-
-		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".py")
-			return 200;
-
-		if (s.find("python") != std::string::npos)
-			return 100;
-
-		return match_none;
-	}
-
-private:
-	void unmarshalCoverageData(struct coverage_data *p)
-	{
-		p->magic = be_to_host<uint64_t>(p->magic);
-		p->size = be_to_host<uint32_t>(p->size);
-		p->line = be_to_host<uint32_t>(p->line);
-	}
-
-	// Sweep through lines in a file to determine what is valid code
-	void parseFile(const std::string &filename)
-	{
-		if (!m_listener)
-			return;
-
-		ISourceFileCache &cache = ISourceFileCache::getInstance();
-
-		std::vector<std::string> lines = cache.getLines(filename);
-
-		// Compute hash for this file
-		uint32_t crc = cache.getCrc(filename);
-
-		unsigned int lineNo = 0;
-		enum
-		{
-			start, multiline_active
-		} state = start;
-		bool multiLineStartLine = false;
-
-		for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
-		{
-			const std::string &s = trim_string(*it);
-
-			lineNo++;
-			// Empty line, ignore
-			if (s == "")
-				continue;
-
-			// Non-empty, but comment
-			if (s[0] == '#')
-				continue;
-
-			// Dict endings generate no code
-			if (s == "}" || s == "},")
-				continue;
-
-			// Ditto for list ends
-			if (s == "]" || s == "],")
-				continue;
-
-			// ... And starts
-			if (s == "[")
-				continue;
-
-			// else: statements are nops
-			if (s.find("else:") != std::string::npos)
-				continue;
-
-			// As is finally:
-			if (s.find("finally:") != std::string::npos)
-				continue;
-
-			// Single-line python strings (e.g., 'description of the function')
-			if (isPythonString(s))
-				continue;
-
-			size_t idx = multilineIdx(s);
-
-			switch (state)
-			{
-			case start:
-				if (idx != std::string::npos)
-				{
-					kcov_debug(ENGINE_MSG, "python multiline ON  %3d: %s\n", lineNo, s.c_str());
-
-					std::string s2 = s.substr(idx + 3, std::string::npos);
-
-					if (multilineIdx(s2) == std::string::npos)
-						state = multiline_active;
-					else
-						// Ends on the same line
-						break;
-
-					/*
-					 *  E.g.
-					 *
-					 *    a = '''yadayada [...]
-					 *    hejsan
-					 *    '''
-					 */
-					if (idx > 0)
-						multiLineStartLine = true;
-
-					// Don't report this line
-					continue;
-				}
-				break;
-			case multiline_active:
-				if (idx != std::string::npos)
-				{
-					kcov_debug(ENGINE_MSG, "python multiline OFF %3d: %s\n", lineNo, s.c_str());
-					state = start;
-
-					// The last line of a multi-line string will get reported by the
-					// python helper, so add this as a line if there was an assignment
-					// above
-					if (multiLineStartLine)
-					{
-						fileLineFound(crc, filename, lineNo);
-						multiLineStartLine = false;
-					}
-				}
-				continue; // Don't report this line
-			default:
-				panic("Unknown state %u", state);
-				break;
-			}
-
-			fileLineFound(crc, filename, lineNo);
-		}
-	}
-
-	size_t multilineIdx(const std::string &s)
-	{
-		size_t idx = s.find("'''");
-
-		if (idx == std::string::npos)
-			idx = s.find("\"\"\"");
-
-		return idx;
-	}
-
-	bool isStringDelimiter(char c)
-	{
-		return c == '\'' || c == '"';
-	}
-
-	bool isPythonString(const std::string &s)
-	{
-		if (s.size() < 2)
-			return false;
-
-		char first = s[0];
-		char last = s[s.size() - 1];
-
-		if (!isStringDelimiter(first))
-			return false;
-
-		// Can be multi-line string, handled elsewhere
-		if (!isStringDelimiter(last))
-			return false;
-
-		unsigned i;
-		for (i = 0; i < s.size(); i++)
-		{
-			if (!isStringDelimiter(s[i]))
-				break;
-		}
-		// Only string characters
-		if (i == s.size())
-			return false;
-
-		return true;
-	}
-
-	struct coverage_data *readCoverageDatum(uint8_t *buf, size_t totalSize)
-	{
-		struct coverage_data *p = (struct coverage_data *) buf;
-		ssize_t rv;
-
-		if (feof(m_pipe))
-			return NULL; // Not an error
-
-		// No data?
-		if (!file_readable(m_pipe, 100))
-			return NULL;
-
-		memset(buf, 0, sizeof(struct coverage_data));
-		rv = fread(buf, 1, sizeof(struct coverage_data), m_pipe);
-		if (rv == 0)
-			return NULL; // Not an error
-
-		if (rv < (int) sizeof(struct coverage_data))
-		{
-			error("Read too little %zd", rv);
-
-			return NULL;
-		}
-		unmarshalCoverageData(p);
-
-		bool valid = p->magic == COVERAGE_MAGIC && p->size < totalSize;
-
-		kcov_debug(ENGINE_MSG, "datum: 0x%16llx, size %u, line %u (%svalid)\n", (unsigned long long) p->magic,
-				(unsigned int) p->size, (unsigned int) p->line, valid ? "" : "in");
-
-		if (!valid)
-		{
-			uint32_t *p32 = (uint32_t *) buf;
-
-			error("Data magic wrong or size too large: %08x %08x %08x %08x\n", p32[0], p32[1], p32[2], p32[3]);
-
-			return NULL;
-		}
-
-		size_t remainder = p->size - sizeof(struct coverage_data);
-		rv = fread(buf + sizeof(struct coverage_data), 1, remainder, m_pipe);
-		if (rv < (ssize_t) remainder)
-		{
-			error("Read too little %zd vs %zu", rv, remainder);
-
-			return NULL;
-		}
-
-		return p;
-	}
-
-	pid_t m_child;
-	FILE *m_pipe;
-};
-
-// This ugly stuff should be fixed
-static PythonEngine *g_pythonEngine;
-class PythonCtor
-{
-public:
-	PythonCtor()
-	{
-		g_pythonEngine = new PythonEngine();
-	}
-};
-static PythonCtor g_pythonCtor;
-
-class PythonEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~PythonEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		return g_pythonEngine;
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		std::string s((const char *) data, 80);
-
-		if (filename.size() >= 3 && filename.substr(filename.size() - 3, filename.size()) == ".py")
-			return 200;
-
-		if (s.find("python") != std::string::npos)
-			return 100;
-
-		return match_none;
-	}
-};
-
-static PythonEngineCreator g_pythonEngineCreator;
diff --git a/kcov-38/src/engines/python-helper.py b/kcov-38/src/engines/python-helper.py
deleted file mode 100644
index d19be6dfa2e8..000000000000
--- a/kcov-38/src/engines/python-helper.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf-8
-
-# Based on http://pymotw.com/2/sys/tracing.html, "Tracing a program as it runs"
-# and http://hg.python.org/cpython/file/2.7/Lib/trace.py
-
-import imp
-import sys
-import os
-import struct
-
-fifo_file = None
-report_trace_real = None
-
-try:
-    # In Py 2.x, the builtins were in __builtin__
-    BUILTINS = sys.modules['__builtin__']
-except KeyError:
-    # In Py 3.x, they're in builtins
-    BUILTINS = sys.modules['builtins']
-
-
-def report_trace3(file, line):
-    size = len(file) + 1 + 8 + 4 + 4
-    data = struct.pack(">QLL%dsb" % len(file), 0x6d6574616c6c6775, size, int(line), bytes(file, 'utf-8'), 0)
-
-    fifo_file.write(data)
-
-def report_trace2(file, line):
-    size = len(file) + 1 + 8 + 4 + 4
-    data = struct.pack(">QLL%dsb" % len(file), 0x6d6574616c6c6775, size, int(line), file, 0)
-
-    fifo_file.write(data)
-
-def report_trace(file, line):
-    try:
-        report_trace_real(file, line)
-        fifo_file.flush()
-    except:
-        # Ignore errors
-        pass
-
-def trace_lines(frame, event, arg):
-    if event != 'line':
-        return
-    co = frame.f_code
-    func_name = co.co_name
-    line_no = frame.f_lineno
-    filename = co.co_filename
-    report_trace(filename, line_no)
-
-def trace_calls(frame, event, arg):
-    if event != 'call':
-        return
-    co = frame.f_code
-    func_name = co.co_name
-    line_no = frame.f_lineno
-    filename = co.co_filename
-    report_trace(filename, line_no)
-    return trace_lines
-
-def runctx(cmd, globals):
-    sys.settrace(trace_calls)
-    try:
-        exec(cmd, globals)
-    finally:
-        sys.settrace(None)
-
-if __name__ == "__main__":
-    if sys.version_info >= (3, 0):
-        report_trace_real = report_trace3
-    else:
-        report_trace_real = report_trace2
-
-    prog_argv = sys.argv[1:]
-
-    sys.argv = prog_argv
-    progname = prog_argv[0]
-    sys.path[0] = os.path.split(progname)[0]
-
-    fifo_path = os.getenv("KCOV_PYTHON_PIPE_PATH")
-    if fifo_path == None:
-        sys.stderr.write("the KCOV_PYTHON_PIPE_PATH environment variable is not set")
-        sys.exit(127)
-    try:
-        fifo_file = open(fifo_path, "wb")
-    except:
-        sys.stderr.write("Can't open fifo file")
-        sys.exit(127)
-
-    main_mod = imp.new_module('__main__')
-    old_main_mod = sys.modules['__main__']
-    sys.modules['__main__'] = main_mod
-    main_mod.__file__ = progname
-    main_mod.__package__ = None
-    main_mod.__builtins__ = BUILTINS
-
-    try:
-        with open(progname) as fp:
-            # try to emulate __main__ namespace as much as possible
-
-            code = compile(fp.read(), progname, 'exec')
-
-            runctx(code, main_mod.__dict__)
-    except IOError:
-        sys.stderr.write("Cannot run file %r" % (sys.argv[0]))
-        sys.exit(127)
-    finally:
-        sys.modules['__main__'] = old_main_mod
diff --git a/kcov-38/src/engines/script-engine-base.hh b/kcov-38/src/engines/script-engine-base.hh
deleted file mode 100644
index d135b597c2dc..000000000000
--- a/kcov-38/src/engines/script-engine-base.hh
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <file-parser.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <lineid.hh>
-#include <utils.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-
-#include <list>
-#include <unordered_map>
-#include <vector>
-
-#include <swap-endian.hh>
-
-using namespace kcov;
-
-/**
- * Base-class for script-based coverage engines.
- */
-class ScriptEngineBase : public IEngine, public IFileParser
-{
-public:
-	ScriptEngineBase() :
-			m_listener(NULL)
-	{
-		IParserManager::getInstance().registerParser(*this);
-	}
-
-	virtual ~ScriptEngineBase()
-	{
-	}
-
-	// From IEngine
-	virtual int registerBreakpoint(unsigned long addr)
-	{
-		// No breakpoints
-		return 0;
-	}
-
-	// From IFileParser
-	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
-	{
-		return true;
-	}
-
-	virtual bool setMainFileRelocation(unsigned long relocation)
-	{
-		return true;
-	}
-
-	virtual void registerLineListener(ILineListener &listener)
-	{
-		m_lineListeners.push_back(&listener);
-	}
-
-	virtual void registerFileListener(IFileListener &listener)
-	{
-		m_fileListeners.push_back(&listener);
-	}
-
-	virtual bool parse()
-	{
-		return true;
-	}
-
-	virtual uint64_t getChecksum()
-	{
-		return 0;
-	}
-
-	virtual enum IFileParser::PossibleHits maxPossibleHits()
-	{
-		return IFileParser::HITS_UNLIMITED;
-	}
-
-	virtual void setupParser(IFilter *filter)
-	{
-	}
-
-protected:
-	void reportEvent(enum event_type type, int data = -1, uint64_t address = 0)
-	{
-		if (!m_listener)
-			return;
-
-		m_listener->onEvent(Event(type, data, address));
-	}
-
-	void fileLineFound(uint32_t crc, const std::string &filename, unsigned int lineNo)
-	{
-		uint64_t id = getLineId(filename, lineNo);
-		uint64_t address = (uint64_t) crc | ((uint64_t) lineNo << 32ULL);
-
-		m_lineIdToAddress[id] = address;
-
-		for (LineListenerList_t::const_iterator lit = m_lineListeners.begin(); lit != m_lineListeners.end(); ++lit)
-			(*lit)->onLine(get_real_path(filename).c_str(), lineNo, address);
-	}
-
-	typedef std::vector<ILineListener *> LineListenerList_t;
-	typedef std::vector<IFileListener *> FileListenerList_t;
-	typedef std::unordered_map<std::string, bool> ReportedFileMap_t;
-	typedef std::unordered_map<uint64_t, uint64_t> LineIdToAddressMap_t;
-
-	LineListenerList_t m_lineListeners;
-	FileListenerList_t m_fileListeners;
-	ReportedFileMap_t m_reportedFiles;
-	LineIdToAddressMap_t m_lineIdToAddress;
-
-	IEventListener *m_listener;
-};
diff --git a/kcov-38/src/engines/system-mode-binary-lib.cc b/kcov-38/src/engines/system-mode-binary-lib.cc
deleted file mode 100644
index 5aa13064ad0c..000000000000
--- a/kcov-38/src/engines/system-mode-binary-lib.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <sys/types.h>
-#include <time.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <utils.hh>
-
-#include <system-mode/registration.hh>
-
-void connectToDaemon(void) __attribute__((constructor));
-
-void connectToDaemon(void)
-{
-	std::string destinationPipe = "/tmp/kcov-system.pipe";
-	std::string outputDir = "/tmp/kcov-data/";
-
-	const char *pipePathEnv = getenv("KCOV_SYSTEM_PIPE");
-	const char *outputDirEnv = getenv("KCOV_SYSTEM_DESTINATION_DIR");
-
-	if (pipePathEnv)
-	{
-		destinationPipe = pipePathEnv;
-	}
-	if (outputDirEnv)
-	{
-		outputDir = outputDirEnv;
-	}
-
-	struct stat st;
-
-	if (lstat(destinationPipe.c_str(), &st) != 0)
-	{
-		fprintf(stderr, "kcov-system-lib: Pipe %s doesn't exist. Giving up\n", destinationPipe.c_str());
-		return;
-	}
-
-
-	char buf[4096];
-	memset(buf, 0, sizeof(buf));
-	int rv = readlink("/proc/self/exe", buf, sizeof(buf));
-
-	if (rv < 0)
-	{
-		fprintf(stderr, "kcov-system-lib: Can't read /proc/self/exe link\n");
-		return;
-	}
-	buf[sizeof(buf) - 1] = '\0';
-	std::string filename = buf;
-
-
-	// Used to make sure the process waits here until the daemon has attached
-	std::string readbackPipe = fmt("%s/%d", outputDir.c_str(), getpid());
-
-	if (::mkfifo(readbackPipe.c_str(), 0644) < 0)
-	{
-		fprintf(stderr, "kcov-system-lib: Can't create readback pipe\n");
-		return;
-	}
-
-	struct new_process_entry *pe = createProcessEntry(getpid(), filename);
-
-	if (write_file(pe, pe->entry_size, "%s", destinationPipe.c_str()) >= 0)
-	{
-		int fd = open(readbackPipe.c_str(), O_RDONLY);
-		if (fd < 0)
-		{
-			unlink(readbackPipe.c_str());
-			return;
-		}
-
-		// Block until something exists
-		rv = read(fd, buf, sizeof(buf));
-
-		if (rv < 0)
-		{
-			fprintf(stderr, "kcov-system-lib: Warning: Read-back returned error?\n");
-		}
-
-		close(fd);
-		unlink(readbackPipe.c_str());
-	}
-	free((void *)pe);
-}
diff --git a/kcov-38/src/engines/system-mode-engine.cc b/kcov-38/src/engines/system-mode-engine.cc
deleted file mode 100644
index 2406cb949adc..000000000000
--- a/kcov-38/src/engines/system-mode-engine.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-#include <file-parser.hh>
-#include <engine.hh>
-#include <configuration.hh>
-#include <output-handler.hh>
-#include <utils.hh>
-#include <generated-data-base.hh>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/param.h>
-#include <signal.h>
-
-#include <list>
-#include <unordered_map>
-#include <vector>
-#include <utility>
-
-#include <system-mode/file-data.hh>
-
-#include "system-mode-file-format.hh"
-
-using namespace kcov;
-
-class SystemModeEngine : public IEngine
-{
-public:
-	enum mode
-	{
-		mode_unset,
-		mode_write_file,
-		mode_read_file,
-	};
-
-
-	SystemModeEngine(enum mode mode) :
-		m_mode(mode),
-		m_listener(NULL),
-		m_breakpointIdx(0)
-	{
-	}
-
-	int registerBreakpoint(unsigned long addr)
-	{
-		m_indexToAddress.push_back(addr);
-		m_breakpointIdx++;
-
-		return m_breakpointIdx - 1;
-	}
-
-	bool start(IEventListener &listener, const std::string &executable)
-	{
-		m_filename = executable;
-		m_listener = &listener;
-
-		return true;
-	}
-
-	void kill(int sig)
-	{
-		// Not applicable
-	}
-
-	bool continueExecution()
-	{
-		size_t sz;
-		void *p = read_file(&sz, "%s", m_filename.c_str());
-
-		if (!p)
-		{
-			error("Can't read file %s\n", m_filename.c_str());
-			return false;
-		}
-		uint32_t checksum = hash_block(p, sz);
-
-		if (m_mode == mode_write_file)
-		{
-			handleWriter(p, sz, checksum);
-		}
-		else if (m_mode == mode_read_file)
-		{
-			handleReadFile();
-		}
-		else
-		{
-			panic("Unknown mode??? Check implementation\n");
-		}
-		free(p);
-
-		// Nothing to do after this
-		reportEvent(ev_exit, 0, 0);
-
-		return false;
-	}
-
-private:
-	void handleWriter(void *p, size_t sz, uint32_t checksum)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		std::string options = getKcovOptionsString();
-		struct stat st;
-
-		if (stat(m_filename.c_str(), &st) < 0)
-		{
-			error("Can't read input file %s\n", m_filename.c_str());
-			return;
-		}
-
-		SystemModeFile *sysFile = SystemModeFile::fromRawFile(checksum, m_filename, options.c_str(), p, sz);
-		if (!sysFile)
-		{
-			error("Can't create sys file\n");
-			return;
-		}
-
-		uint32_t idx = 0;
-		for (std::vector<uint64_t>::iterator it = m_indexToAddress.begin();
-				it != m_indexToAddress.end();
-				++it, ++idx)
-		{
-			sysFile->addEntry(idx, *it);
-		}
-
-		std::string dst = conf.keyAsString("system-mode-write-file");
-
-		size_t processedSize;
-		const void *data = sysFile->getProcessedData(processedSize);
-
-		if (data)
-		{
-			write_file(data, processedSize, "%s", dst.c_str());
-			if (chmod(dst.c_str(), st.st_mode) < 0)
-			{
-				error("Can't chmod???\n");
-			}
-		}
-
-		free((void *)data);
-
-		std::string patchelf = conf.keyAsString("patchelf-command");
-		std::string lib = "libkcov_system.so";
-		std::string cmd = fmt("%s --add-needed %s %s", patchelf.c_str(), lib.c_str(), dst.c_str());
-
-		// FIXME! Check if patchelf exists
-
-		int rv = system(cmd.c_str());
-		if (WEXITSTATUS(rv) != 0)
-		{
-			error("patchelf command error %d\n", rv);
-		}
-
-		delete sysFile;
-	}
-
-	void handleReadFile()
-	{
-		std::string src = IConfiguration::getInstance().keyAsString("system-mode-read-results-file");
-
-		kcov_system_mode::system_mode_memory *results = kcov_system_mode::diskToMemory(src);
-
-		if (!results)
-		{
-			return;
-		}
-
-		for (unsigned i = 0; i < results->n_entries * 32; i++) // 32 bits per entry
-		{
-			if (results->indexIsHit(i))
-			{
-				reportEvent(ev_breakpoint, 0, m_indexToAddress[i]);
-			}
-		}
-
-		delete results;
-	}
-
-	std::string getKcovOptionsString()
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		return fmt("%s %s %s %s %s %s ",
-				keyListAsString(conf.keyAsList("include-pattern")).c_str(),
-				keyListAsString(conf.keyAsList("exclude-pattern")).c_str(),
-				keyListAsString(conf.keyAsList("include-path")).c_str(),
-				keyListAsString(conf.keyAsList("exclude-path")).c_str(),
-				conf.keyAsString("exclude-line").c_str(),
-				conf.keyAsString("exclude-region").c_str());
-	}
-
-	std::string keyListAsString(const std::vector<std::string> &list)
-	{
-		std::string out;
-
-		if (list.empty())
-		{
-			return "";
-		}
-
-		for (std::vector<std::string>::const_iterator it = list.begin();
-				it != list.end();
-				++it)
-		{
-			out = out + *it + ",";
-		}
-		out = out.substr(0, out.size() - 1); // Remove last ,
-
-		return out;
-	}
-
-	void reportEvent(enum event_type type, int data = -1, uint64_t address = 0)
-	{
-		if (!m_listener)
-			return;
-
-		m_listener->onEvent(Event(type, data, address));
-	}
-
-	const enum mode m_mode;
-
-	IEngine::IEventListener *m_listener;
-	uint32_t m_breakpointIdx;
-
-	std::vector<uint64_t> m_indexToAddress;
-	std::string m_filename;
-};
-
-
-// This ugly stuff was again inherited from bashEngine
-class SystemModeEngineCreator : public IEngineFactory::IEngineCreator
-{
-public:
-	virtual ~SystemModeEngineCreator()
-	{
-	}
-
-	virtual IEngine *create()
-	{
-		SystemModeEngine::mode mode = SystemModeEngine::mode_read_file;
-
-		if (IConfiguration::getInstance().keyAsString("system-mode-write-file") != "")
-		{
-			mode = SystemModeEngine::mode_write_file;
-		}
-
-		return new SystemModeEngine(mode);
-	}
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		if (conf.keyAsString("system-mode-write-file") != "" ||
-				conf.keyAsString("system-mode-read-results-file") != "")
-		{
-			return match_perfect;
-		}
-
-		return match_none;
-	}
-
-private:
-	std::string m_filename;
-};
-
-static SystemModeEngineCreator g_systemModeEngineCreator;
diff --git a/kcov-38/src/engines/system-mode-file-format.cc b/kcov-38/src/engines/system-mode-file-format.cc
deleted file mode 100644
index 1a4c8afbb400..000000000000
--- a/kcov-38/src/engines/system-mode-file-format.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "system-mode-file-format.hh"
-
-#include <utils.hh>
-
-struct kcov_system_mode::system_mode_file *kcov_system_mode::memoryToFile(const class kcov_system_mode::system_mode_memory &mem, size_t &outSize)
-{
-	outSize = sizeof(struct system_mode_file) + mem.n_entries * sizeof(uint32_t) +
-			mem.filename.size() + mem.options.size() + 2;
-	struct system_mode_file *out = (struct system_mode_file *)xmalloc(outSize);
-	char *p = (char *)out;
-
-	out->magic = SYSTEM_MODE_FILE_MAGIC;
-	out->version = SYSTEM_MODE_FILE_VERSION;
-	out->n_entries = mem.n_entries;
-	out->filename_offset = mem.n_entries * sizeof(uint32_t) + sizeof(*out);
-	out->kcov_options_offset = out->filename_offset + mem.filename.size() + 1;
-
-	strcpy(&p[out->filename_offset], mem.filename.c_str());
-	strcpy(&p[out->kcov_options_offset], mem.options.c_str());
-
-	memcpy(out->data, mem.data, out->n_entries * sizeof(uint32_t));
-
-	return out;
-}
-
-class kcov_system_mode::system_mode_memory *kcov_system_mode::fileToMemory(const struct kcov_system_mode::system_mode_file &file)
-{
-	if (file.magic != SYSTEM_MODE_FILE_MAGIC)
-	{
-		return NULL;
-	}
-
-	if (file.version != SYSTEM_MODE_FILE_VERSION)
-	{
-		return NULL;
-	}
-
-	size_t sizeExceptStrings = sizeof(file) + file.n_entries * sizeof(uint32_t);
-
-	if (file.filename_offset < sizeExceptStrings)
-	{
-		return NULL;
-	}
-
-	if (file.kcov_options_offset < file.filename_offset + 1)
-	{
-		return NULL;
-	}
-	char *p = (char *)&file;
-
-	kcov_system_mode::system_mode_memory *out = new kcov_system_mode::system_mode_memory(std::string(&p[file.filename_offset]),
-			std::string(&p[file.kcov_options_offset]),
-			file.n_entries);
-
-	memcpy(out->data, file.data, out->n_entries * sizeof(uint32_t));
-
-	return out;
-}
-
-class kcov_system_mode::system_mode_memory *kcov_system_mode::diskToMemory(const std::string &src)
-{
-	size_t sz;
-	kcov_system_mode::system_mode_file *p = (kcov_system_mode::system_mode_file *)read_file(&sz, "%s", src.c_str());
-
-	if (!p)
-	{
-		return NULL;
-	}
-
-	kcov_system_mode::system_mode_memory *out = kcov_system_mode::fileToMemory(*p);
-	free(p);
-
-	return out;
-}
-
-bool kcov_system_mode::system_mode_memory::indexIsHit(uint32_t index) const
-{
-	if (index / 32 >= n_entries)
-	{
-		return false;
-	}
-
-	uint32_t cur = data[index / 32];
-	uint32_t bit = index % 32;
-
-	return !!(cur & (1 << bit));
-}
-
-void kcov_system_mode::system_mode_memory::reportIndex(uint32_t index)
-{
-	unsigned int wordIdx = index / 32;
-	unsigned int bit = index % 32;
-
-	if (wordIdx >= n_entries)
-	{
-		return;
-	}
-
-	// Update the bit atomically
-	uint32_t *p = &data[wordIdx];
-
-	// Already hit?
-	if (*p & (1 << bit))
-		return;
-
-	uint32_t val, newVal;
-	do
-	{
-		val = *p;
-		newVal = val | (1 << bit);
-
-	} while (!__sync_bool_compare_and_swap(p, val, newVal));
-
-	__sync_fetch_and_add(dirtyCount, 1);
-}
-
-bool kcov_system_mode::system_mode_memory::isDirty() const
-{
-	return *dirtyCount != *cleanCount;
-}
-
-void kcov_system_mode::system_mode_memory::markClean()
-{
-	*cleanCount = *dirtyCount;
-}
diff --git a/kcov-38/src/engines/system-mode-file-format.hh b/kcov-38/src/engines/system-mode-file-format.hh
deleted file mode 100644
index 034557bdcad2..000000000000
--- a/kcov-38/src/engines/system-mode-file-format.hh
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <string>
-#include <sys/mman.h>
-
-#include <utils.hh>
-
-const uint32_t SYSTEM_MODE_FILE_MAGIC = 0x4d455247; // "MERG"
-const uint32_t SYSTEM_MODE_FILE_VERSION = 1;
-
-namespace kcov_system_mode
-{
-	struct system_mode_file
-	{
-		uint32_t magic;
-		uint32_t version;
-		uint32_t n_entries;
-		uint32_t header_checksum;
-		uint32_t filename_offset;
-		uint32_t kcov_options_offset; // --include-pattern etc
-		uint32_t data[];
-	};
-
-	class system_mode_memory
-	{
-	public:
-		system_mode_memory(const std::string &fn, const std::string &opts, uint32_t n) :
-			filename(fn),
-			options(opts),
-			n_entries(n)
-		{
-			mapped = true;
-			data = (uint32_t *)::mmap(NULL, (n_entries + 2) * sizeof(uint32_t), PROT_READ | PROT_WRITE,
-					MAP_SHARED | MAP_ANONYMOUS, -1, 0);
-			if (!data)
-			{
-				// Fallback to plain malloc - won't work with forks
-				data = (uint32_t *)xmalloc((n_entries + 2) * sizeof(uint32_t));
-			}
-
-			dirtyCount = &data[n_entries];
-			cleanCount = &data[n_entries + 1];
-
-			*dirtyCount = 0;
-			*cleanCount = 0;
-		}
-
-		~system_mode_memory()
-		{
-			if (mapped)
-			{
-				munmap(data, n_entries * sizeof(uint32_t));
-			}
-			else
-			{
-				free(data);
-			}
-		}
-
-		void reportIndex(uint32_t index);
-
-		bool indexIsHit(uint32_t index) const;
-
-		bool isDirty() const;
-
-		void markClean();
-
-		const std::string filename;
-		const std::string options;
-		const uint32_t n_entries;
-		uint32_t *data;
-
-		uint32_t *dirtyCount;
-		uint32_t *cleanCount;
-
-	private:
-		bool mapped;
-	};
-
-	struct system_mode_file *memoryToFile(const class system_mode_memory &mem, size_t &outSize);
-
-	class system_mode_memory *fileToMemory(const struct system_mode_file &file);
-
-	class system_mode_memory *diskToMemory(const std::string &src);
-};
diff --git a/kcov-38/src/filter.cc b/kcov-38/src/filter.cc
deleted file mode 100644
index ed2736908aa7..000000000000
--- a/kcov-38/src/filter.cc
+++ /dev/null
@@ -1,362 +0,0 @@
-#include <filter.hh>
-#include <configuration.hh>
-#include <utils.hh>
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string>
-#include <vector>
-
-using namespace kcov;
-
-class BasicFilter : public IFilter
-{
-public:
-	BasicFilter()
-	{
-		m_fileLineHandler = new FileLineHandler();
-	}
-
-	~BasicFilter()
-	{
-		delete m_fileLineHandler;
-	}
-
-	// Allow anything
-	virtual bool runFilters(const std::string &file)
-	{
-		return true;
-	}
-
-	virtual bool runLineFilters(const std::string &filePath,
-			unsigned int lineNr, const std::string &line)
-	{
-		return m_fileLineHandler->match(filePath, lineNr, line);
-	}
-
-	virtual std::string mangleSourcePath(const std::string &path)
-	{
-		return path;
-	}
-
-protected:
-	class FileLineHandler
-	{
-	public:
-		FileLineHandler()
-		{
-			m_lineBeginPatterns.push_back("LCOV_EXCL_START");
-			m_lineEndPatterns.push_back("LCOV_EXCL_STOP");
-
-			m_ignoreSingleLinePatterns.push_back("LCOV_EXCL_LINE");
-			m_ignoreSingleLinePatterns.push_back("#[should_panic]");
-
-			// Handle command line options
-			std::string cmd = IConfiguration::getInstance().keyAsString(
-					"exclude-line");
-
-			if (cmd != "")
-			{
-				std::vector<std::string> cmds = split_string(cmd, ",");
-
-				for (std::vector<std::string>::iterator it = cmds.begin();
-						it != cmds.end(); ++it)
-					m_ignoreSingleLinePatterns.push_back(*it);
-			}
-
-			std::string startStop = IConfiguration::getInstance().keyAsString(
-					"exclude-region");
-
-			if (startStop != "")
-			{
-				std::vector<std::string> cmds = split_string(startStop, ",");
-
-				for (std::vector<std::string>::iterator it = cmds.begin();
-						it != cmds.end(); ++it)
-				{
-					std::vector<std::string> entries = split_string(*it, ":");
-
-					if (entries.size() >= 1)
-						m_lineBeginPatterns.push_back(entries[0]);
-					if (entries.size() > 1)
-						m_lineEndPatterns.push_back(entries[1]);
-
-				}
-			}
-
-			m_excludeStart = 0;
-		}
-
-		bool match(const std::string &filePath, unsigned int lineNr,
-				const std::string &line)
-		{
-			bool out = true;
-
-			// Source file swapped
-			if (m_curFile != filePath)
-			{
-				m_excludeStart = 0;
-				m_curFile = filePath;
-			}
-
-			for (std::vector<std::string>::iterator it =
-					m_ignoreSingleLinePatterns.begin();
-					it != m_ignoreSingleLinePatterns.end(); ++it)
-			{
-				if (line.find(*it) != std::string::npos)
-					out = false;
-			}
-
-			for (std::vector<std::string>::iterator it =
-					m_lineBeginPatterns.begin();
-					it != m_lineBeginPatterns.end(); ++it)
-			{
-				if (line.find(*it) != std::string::npos)
-				{
-					m_excludeStart++;
-					break;
-				}
-			}
-
-			// The line including the stop should be covered
-			if (m_excludeStart > 0)
-				out = false;
-
-			for (std::vector<std::string>::iterator it =
-					m_lineEndPatterns.begin(); it != m_lineEndPatterns.end();
-					++it)
-			{
-				if (line.find(*it) != std::string::npos)
-				{
-					m_excludeStart--;
-					break;
-				}
-			}
-
-			// Ignore multiple stops
-			if (m_excludeStart < 0)
-				m_excludeStart = 0;
-
-			return out;
-		}
-
-	private:
-		std::string m_curFile;
-		std::vector<std::string> m_ignoreSingleLinePatterns;
-
-		std::vector<std::string> m_lineBeginPatterns;
-		std::vector<std::string> m_lineEndPatterns;
-		int m_excludeStart;
-	};
-
-	FileLineHandler *m_fileLineHandler;
-};
-
-class Filter: public BasicFilter
-{
-public:
-	Filter()
-	{
-		m_patternHandler = new PatternHandler();
-		m_pathHandler = new PathHandler();
-
-		m_origRoot = IConfiguration::getInstance().keyAsString(
-				"orig-path-prefix");
-		m_newRoot = IConfiguration::getInstance().keyAsString(
-				"new-path-prefix");
-	}
-
-	~Filter()
-	{
-		delete m_patternHandler;
-		delete m_pathHandler;
-	}
-
-	// Used by the unit test
-	void setup()
-	{
-		delete m_fileLineHandler;
-		delete m_patternHandler;
-		delete m_pathHandler;
-		m_patternHandler = new PatternHandler();
-		m_pathHandler = new PathHandler();
-		m_fileLineHandler = new FileLineHandler();
-	}
-
-	bool runFilters(const std::string &file)
-	{
-		bool out = true;
-
-		if (m_pathHandler->isSetup())
-			out = m_pathHandler->includeFile(file);
-
-		if (out && m_patternHandler->isSetup())
-			return m_patternHandler->includeFile(file);
-
-		return out;
-	}
-
-	std::string mangleSourcePath(const std::string &path)
-	{
-		std::string filename = get_real_path(path);
-
-		if (m_origRoot.length() > 0 && m_newRoot.length() > 0)
-		{
-			std::string path = filename;
-			size_t index = path.find(m_origRoot);
-
-			if (index != std::string::npos)
-			{
-				path.replace(index, m_origRoot.length(), m_newRoot);
-				filename = get_real_path(path);
-			}
-		}
-
-		return filename;
-	}
-
-private:
-	class PatternHandler
-	{
-	public:
-		PatternHandler() :
-				m_includePatterns(
-						IConfiguration::getInstance().keyAsList(
-								"include-pattern")), m_excludePatterns(
-						IConfiguration::getInstance().keyAsList(
-								"exclude-pattern"))
-		{
-		}
-
-		bool isSetup()
-		{
-			return !(m_includePatterns.size() == 0
-					&& m_excludePatterns.size() == 0);
-		}
-
-		bool includeFile(std::string file)
-		{
-			if (m_includePatterns.size() == 0 && m_excludePatterns.size() == 0)
-				return true;
-
-			bool out = true;
-
-			if (m_includePatterns.size() != 0)
-				out = false;
-
-			for (PatternMap_t::const_iterator it = m_includePatterns.begin();
-					it != m_includePatterns.end(); ++it)
-			{
-				const std::string &pattern = *it;
-
-				if (file.find(pattern) != std::string::npos)
-					out = true;
-			}
-
-			for (PatternMap_t::const_iterator it = m_excludePatterns.begin();
-					it != m_excludePatterns.end(); ++it)
-			{
-				const std::string &pattern = *it;
-
-				if (file.find(pattern) != std::string::npos)
-					out = false;
-			}
-
-			return out;
-		}
-	private:
-		typedef std::vector<std::string> PatternMap_t;
-
-		const PatternMap_t &m_includePatterns;
-		const PatternMap_t &m_excludePatterns;
-	};
-
-	class PathHandler
-	{
-	public:
-		PathHandler() :
-				m_includePaths(
-						IConfiguration::getInstance().keyAsList(
-								"include-path")), m_excludePaths(
-						IConfiguration::getInstance().keyAsList("exclude-path"))
-		{
-			for (PathMap_t::iterator it = m_includePaths.begin();
-					it != m_includePaths.end(); ++it)
-				*it = get_real_path(*it);
-
-			for (PathMap_t::iterator it = m_excludePaths.begin();
-					it != m_excludePaths.end(); ++it)
-				*it = get_real_path(*it);
-		}
-
-		bool isSetup()
-		{
-			return !(m_includePaths.size() == 0 && m_excludePaths.size() == 0);
-		}
-
-		bool includeFile(const std::string &file)
-		{
-			if (m_includePaths.size() == 0 && m_excludePaths.size() == 0)
-				return true;
-
-			bool out = true;
-
-			if (m_includePaths.size() != 0)
-				out = false;
-
-			const std::string pathStr = get_real_path(file);
-
-			// If found in --include-path=, accept this path
-			for (PathMap_t::const_iterator it = m_includePaths.begin();
-					it != m_includePaths.end(); ++it)
-			{
-				const std::string &pathPattern = *it;
-				size_t last = pathPattern.size();
-
-				if (pathStr.find(pathPattern) == 0
-						&& (pathStr.size() <= last || pathStr[last] == '/'))
-				{
-					out = true;
-					break;
-				}
-			}
-
-			// ... unless it's found in --exclude-path=.
-			for (PathMap_t::const_iterator it = m_excludePaths.begin();
-					it != m_excludePaths.end(); ++it)
-			{
-				const std::string &pathPattern = *it;
-				size_t last = pathPattern.size();
-
-				if (pathStr.find(pathPattern) == 0
-						&& (pathStr.size() <= last || pathStr[last] == '/'))
-				{
-					out = false;
-					break;
-				}
-			}
-
-			return out;
-		}
-	private:
-		typedef std::vector<std::string> PathMap_t;
-
-		PathMap_t m_includePaths;
-		PathMap_t m_excludePaths;
-	};
-
-	PatternHandler *m_patternHandler;
-	PathHandler *m_pathHandler;
-	std::string m_origRoot;
-	std::string m_newRoot;
-};
-
-IFilter &IFilter::create()
-{
-	return *new Filter();
-}
-
-IFilter &IFilter::createBasic()
-{
-	return *new BasicFilter();
-}
diff --git a/kcov-38/src/gcov.cc b/kcov-38/src/gcov.cc
deleted file mode 100644
index eeed786382b4..000000000000
--- a/kcov-38/src/gcov.cc
+++ /dev/null
@@ -1,409 +0,0 @@
-#include <gcov.hh>
-#include <utils.hh>
-
-using namespace kcov;
-
-/*
- * From gcov-io.h:
- *
- *  int32:  byte3 byte2 byte1 byte0 | byte0 byte1 byte2 byte3
- *  int64:  int32:low int32:high
- *  string: int32:0 | int32:length char* char:0 padding
- *  padding: | char:0 | char:0 char:0 | char:0 char:0 char:0
- *  item: int32 | int64 | string
- *
- * File:
- *  file : int32:magic int32:version int32:stamp record*
- *
- * Record:
- *  record: header data
- *  header: int32:tag int32:length
- *  data: item*
- *
- * gcno file records:
- *  note: unit function-graph*
- *  unit: header int32:checksum string:source
- *  function-graph: announce_function basic_blocks {arcs | lines}*
- *  announce_function: header int32:ident
- *    int32:lineno_checksum int32:cfg_checksum
- *    string:name string:source int32:lineno
- *  basic_block: header int32:flags*
- *  arcs: header int32:block_no arc*
- *  arc:  int32:dest_block int32:flags
- *  lines: header int32:block_no line*
- *    int32:0 string:NULL
- *  line:  int32:line_no | int32:0 string:filename
- *
- * gcda file records:
- *   data: {unit summary:object summary:program* function-data*}*
- *   unit: header int32:checksum
- *   function-data:	announce_function present counts
- *   announce_function: header int32:ident
- *       int32:lineno_checksum int32:cfg_checksum
- *   present: header int32:present
- *   counts: header int64:count*
- *   summary: int32:checksum {count-summary}GCOV_COUNTERS_SUMMABLE
- *   count-summary:	int32:num int32:runs int64:sum
- *      int64:max int64:sum_max histogram
- *   histogram: {int32:bitvector}8 histogram-buckets*
- *     histogram-buckets: int32:num int64:min int64:sum
- */
-#define GCOV_DATA_MAGIC ((uint32_t)0x67636461) /* "gcda" */
-#define GCOV_NOTE_MAGIC ((uint32_t)0x67636e6f) /* "gcno" */
-
-#define GCOV_TAG_FUNCTION	 ((uint32_t)0x01000000)
-#define GCOV_TAG_FUNCTION_LENGTH (3)
-#define GCOV_TAG_BLOCKS		 ((uint32_t)0x01410000)
-#define GCOV_TAG_BLOCKS_LENGTH(NUM) (NUM)
-#define GCOV_TAG_BLOCKS_NUM(LENGTH) (LENGTH)
-#define GCOV_TAG_ARCS		 ((uint32_t)0x01430000)
-#define GCOV_TAG_ARCS_LENGTH(NUM)  (1 + (NUM) * 2)
-#define GCOV_TAG_ARCS_NUM(LENGTH)  (((LENGTH) - 1) / 2)
-#define GCOV_TAG_LINES		 ((uint32_t)0x01450000)
-#define GCOV_TAG_COUNTER_BASE 	 ((uint32_t)0x01a10000)
-#define GCOV_TAG_COUNTER_LENGTH(NUM) ((NUM) * 2)
-#define GCOV_TAG_COUNTER_NUM(LENGTH) ((LENGTH) / 2)
-#define GCOV_TAG_OBJECT_SUMMARY  ((uint32_t)0xa1000000) /* Obsolete */
-#define GCOV_TAG_PROGRAM_SUMMARY ((uint32_t)0xa3000000)
-#define GCOV_TAG_SUMMARY_LENGTH(NUM)  \
-        (1 + GCOV_COUNTERS_SUMMABLE * (10 + 3 * 2) + (NUM) * 5)
-#define GCOV_TAG_AFDO_FILE_NAMES ((uint32_t)0xaa000000)
-#define GCOV_TAG_AFDO_FUNCTION ((uint32_t)0xac000000)
-#define GCOV_TAG_AFDO_WORKING_SET ((uint32_t)0xaf000000)
-
-/* Arc flags */
-#define GCOV_ARC_ON_TREE 	 (1 << 0)
-#define GCOV_ARC_FAKE		 (1 << 1)
-#define GCOV_ARC_FALLTHROUGH (1 << 2)
-
-struct file_header
-{
-	int32_t magic;
-	int32_t version;
-	int32_t stamp;
-};
-
-struct header
-{
-	int32_t tag;
-	int32_t length;
-};
-
-GcovParser::GcovParser(const uint8_t *data, size_t dataSize) :
-		m_data(data), m_dataSize(dataSize)
-{
-}
-
-GcovParser::~GcovParser()
-{
-	free((void *) m_data);
-}
-
-bool GcovParser::parse()
-{
-	// Not a gcov file?
-	if (!verify())
-		return false;
-
-	const uint8_t *cur = m_data + sizeof(struct file_header);
-	ssize_t left = (ssize_t) (m_dataSize - sizeof(struct file_header));
-
-	// Iterate through the headers
-	while (1)
-	{
-		const struct header *header = (struct header *) cur;
-
-		if (!onRecord(header, cur + sizeof(*header)))
-			return false;
-
-		size_t curLen = sizeof(struct header) + header->length * 4;
-		left -= curLen;
-
-		if (left <= 0)
-			break;
-
-		cur += curLen;
-	}
-
-	return true;
-}
-
-bool GcovParser::verify()
-{
-	const struct file_header *header = (const struct file_header *) m_data;
-
-	if (header->magic != GCOV_DATA_MAGIC && header->magic != GCOV_NOTE_MAGIC)
-		return false;
-
-	return true;
-}
-
-const uint8_t *GcovParser::readString(const uint8_t *p, std::string &out)
-{
-	int32_t length = *(const int32_t*) p;
-	const char *c_str = (const char *) &p[4];
-
-	out = std::string(c_str);
-
-	return padPointer(p + length * 4 + 4); // Including the length field
-}
-
-// Convenience when using 32-bit pointers
-const int32_t *GcovParser::readString(const int32_t *p, std::string &out)
-{
-	return (const int32_t *) readString((const uint8_t *) p, out);
-}
-
-const uint8_t *GcovParser::padPointer(const uint8_t *p)
-{
-	unsigned long addr = (unsigned long) p;
-
-	if ((addr & 3) != 0)
-		p += 4 - (addr & 3);
-
-	return p;
-}
-
-GcnoParser::BasicBlockMapping::BasicBlockMapping(const BasicBlockMapping &other) :
-		m_function(other.m_function), m_basicBlock(other.m_basicBlock),
-		m_file(other.m_file), m_line(other.m_line), m_index(other.m_index)
-{
-}
-
-GcnoParser::BasicBlockMapping::BasicBlockMapping(int32_t function,
-		int32_t basicBlock, const std::string &file, int32_t line,
-		int32_t index) :
-		m_function(function), m_basicBlock(basicBlock), m_file(file), m_line(line), m_index(index)
-{
-}
-
-GcnoParser::Arc::Arc(const Arc &other) :
-		m_function(other.m_function), m_srcBlock(other.m_srcBlock), m_dstBlock(
-				other.m_dstBlock)
-{
-}
-
-GcnoParser::Arc::Arc(int32_t function, int32_t srcBlock, int32_t dstBlock) :
-		m_function(function), m_srcBlock(srcBlock), m_dstBlock(dstBlock)
-{
-}
-
-GcnoParser::GcnoParser(const uint8_t *data, size_t dataSize) :
-		GcovParser(data, dataSize), m_functionId(-1)
-{
-}
-
-const GcnoParser::BasicBlockList_t &GcnoParser::getBasicBlocks()
-{
-	return m_basicBlocks;
-}
-
-const GcnoParser::FunctionList_t &GcnoParser::getFunctions()
-{
-	return m_functions;
-}
-
-const GcnoParser::ArcList_t &GcnoParser::getArcs()
-{
-	return m_arcs;
-}
-
-bool GcnoParser::onRecord(const struct header *header, const uint8_t *data)
-{
-	kcov_debug(ENGINE_MSG, "GCNO record: 0x%08x (%d bytes)\n", header->tag,
-			header->length * 4);
-
-	switch (header->tag)
-	{
-	case GCOV_TAG_FUNCTION:
-		onAnnounceFunction(header, data);
-		break;
-	case GCOV_TAG_BLOCKS:
-		onBlocks(header, data);
-		break;
-	case GCOV_TAG_LINES:
-		onLines(header, data);
-		break;
-	case GCOV_TAG_ARCS:
-		onArcs(header, data);
-		break;
-	default:
-		break;
-	}
-
-	return true;
-}
-
-void GcnoParser::onAnnounceFunction(const struct header *header,
-		const uint8_t *data)
-{
-	const int32_t *p32 = (const int32_t *) data;
-	const uint8_t *p8 = data;
-	int32_t ident = p32[0];
-
-	p8 = readString(p8 + 3 * 4, m_function);
-	p8 = readString(p8, m_file);
-	m_functionId = ident;
-
-	m_functions.push_back(m_functionId);
-
-	kcov_debug(ENGINE_MSG, "GCNO function %d: %s\n", m_functionId,
-			m_file.c_str());
-	// The first line of this function comes next, but let's ignore that
-}
-
-void GcnoParser::onBlocks(const struct header *header, const uint8_t *data)
-{
-	// Not used by kcov
-}
-
-void GcnoParser::onLines(const struct header *header, const uint8_t *data)
-{
-	const int32_t *p32 = (const int32_t *) data;
-	int32_t blockNo = p32[0];
-	const int32_t *last = &p32[header->length];
-	int32_t n = 0; // index
-
-	p32++; // Skip blockNo
-
-	// Iterate through lines
-	while (p32 < last)
-	{
-		int32_t line = *p32;
-
-		// File name
-		if (line == 0)
-		{
-			std::string name;
-
-			// Setup current file name
-			p32 = readString(p32 + 1, name);
-			if (name != "")
-				m_file = name;
-
-			continue;
-		}
-
-		p32++;
-
-		kcov_debug(ENGINE_MSG, "GCNO basic block in function %d, nr %d %s:%d\n",
-				m_functionId, blockNo, m_file.c_str(), line);
-		m_basicBlocks.push_back(
-				BasicBlockMapping(m_functionId, blockNo, m_file, line, n));
-
-		n++;
-	}
-}
-
-void GcnoParser::onArcs(const struct header *header, const uint8_t *data)
-{
-	const int32_t *p32 = (const int32_t *) data;
-	int32_t blockNo = p32[0];
-	const int32_t *last = &p32[header->length];
-	unsigned int arc = 0;
-
-	p32++; // Skip blockNo
-
-	// Iterate through lines
-	while (p32 < last)
-	{
-		int32_t destBlock = p32[0];
-		int32_t flags = p32[1];
-
-		// Report non-on-tree arcs
-		if (!(flags & GCOV_ARC_ON_TREE))
-			m_arcs.push_back(Arc(m_functionId, blockNo, destBlock));
-
-		kcov_debug(ENGINE_MSG, "GCNO arc in function %d, %d->%d (flags %d%s)\n",
-				m_functionId, blockNo, destBlock, flags,
-				flags & GCOV_ARC_ON_TREE ? " OT" : "");
-
-		p32 += 2;
-		arc++;
-	}
-}
-
-GcdaParser::GcdaParser(const uint8_t *data, size_t dataSize) :
-		GcovParser(data, dataSize), m_functionId(-1)
-{
-}
-
-size_t GcdaParser::countersForFunction(int32_t function)
-{
-	if (function < 0)
-		panic("Garbage in!");
-
-	if (m_functionToCounters.find(function) == m_functionToCounters.end())
-		return 0;
-
-	// Simply the size of the vector
-	return m_functionToCounters[function].size();
-}
-
-int64_t GcdaParser::getCounter(int32_t function, int32_t counter)
-{
-	if (function < 0 || counter < 0)
-		panic("Garbage in!");
-
-	if (m_functionToCounters.find(function) == m_functionToCounters.end())
-		return -1;
-
-	// List of counters
-	CounterList_t &cur = m_functionToCounters[function];
-	if ((size_t) counter >= cur.size())
-		return -1;
-
-	return cur[counter];
-}
-
-bool GcdaParser::onRecord(const struct header *header, const uint8_t *data)
-{
-	kcov_debug(ENGINE_MSG, "GCDA record: 0x%08x (%d bytes)\n", header->tag,
-			header->length * 4);
-
-	switch (header->tag)
-	{
-	case GCOV_TAG_FUNCTION:
-		onAnnounceFunction(header, data);
-		break;
-	case GCOV_TAG_COUNTER_BASE:
-		onCounterBase(header, data);
-		break;
-	default:
-		break;
-	}
-
-	return true;
-}
-
-void GcdaParser::onAnnounceFunction(const struct header *header,
-		const uint8_t *data)
-{
-	const int32_t *p32 = (const int32_t *) data;
-	int32_t ident = p32[0];
-
-	// FIXME! Handle checksums after this
-	m_functionId = ident;
-
-	kcov_debug(ENGINE_MSG, "GCDA function %d\n", ident);
-}
-
-void GcdaParser::onCounterBase(const struct header *header, const uint8_t *data)
-{
-	const int32_t *p32 = (const int32_t *) data;
-	int32_t count = header->length; // 32-bit data with 64-bit values
-
-	// Store all counters in a list
-	CounterList_t counters;
-	for (int32_t i = 0; i < count; i += 2)
-	{
-		uint64_t v64 = (uint64_t) p32[i] | ((uint64_t) p32[i + 1] << 32ULL);
-
-		counters.push_back(v64);
-
-		kcov_debug(ENGINE_MSG, "GCDA counter %d %lld\n", i,
-				(long long) counters.back());
-	}
-
-	m_functionToCounters[m_functionId] = counters;
-}
diff --git a/kcov-38/src/include/capabilities.hh b/kcov-38/src/include/capabilities.hh
deleted file mode 100644
index 9a669bd4cb3e..000000000000
--- a/kcov-38/src/include/capabilities.hh
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace kcov
-{
-	/**
-	 * Singleton class for kcov capabilities, typically for different engines.
-	 */
-	class ICapabilities
-	{
-	public:
-		virtual ~ICapabilities()
-		{
-		}
-
-		/**
-		 * Add a kcov capability.
-		 *
-		 * Will panic if an unknown capability is added.
-		 *
-		 * @param name the name of the capability
-		 */
-		virtual void addCapability(const std::string &name) = 0;
-
-		/**
-		 * Remove a kcov capability.
-		 *
-		 * Will panic if an unknown capability is removed.
-		 *
-		 * @param name the name of the capability
-		 */
-		virtual void removeCapability(const std::string &name) = 0;
-
-		/**
-		 * Return if kcov has a capability.
-		 *
-		 * Will panic if an unknown capability is added.
-		 *
-		 * @param name the name of the capability.
-		 */
-		virtual bool hasCapability(const std::string &name) = 0;
-
-
-		/**
-		 * Singleton getter.
-		 *
-		 * @return a reference to the capability singleton
-		 */
-		static ICapabilities &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/collector.hh b/kcov-38/src/include/collector.hh
deleted file mode 100644
index 79e5d5f2a743..000000000000
--- a/kcov-38/src/include/collector.hh
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace kcov
-{
-	class IFileParser;
-	class IEngine;
-	class IFilter;
-
-	/**
-	 * Run a program and collect coverage for it.
-	 */
-	class ICollector
-	{
-	public:
-		class IListener
-		{
-		public:
-			/**
-			 * Called when an address is hit.
-			 *
-			 * @param addr the address which just got executed
-			 * @param hits the number of hits for the address
-			 */
-			virtual void onAddressHit(uint64_t addr, unsigned long hits) = 0;
-		};
-
-		class IEventTickListener
-		{
-		public:
-			virtual void onTick() = 0;
-		};
-
-		virtual ~ICollector() {};
-
-		/**
-		 * Register a listener for breakpoint address hits
-		 *
-		 * @param listener the listener
-		 */
-		virtual void registerListener(IListener &listener) = 0;
-
-		/**
-		 * Register a listener for events (called on each breakpoint)
-		 */
-		virtual void registerEventTickListener(IEventTickListener &listener) = 0;
-
-		/**
-		 * Run a program and collect coverage data
-		 *
-		 * @param filename the program to run
-		 */
-		virtual int run(const std::string &filename) = 0;
-
-
-
-		static ICollector &create(IFileParser &elf, IEngine &engine, IFilter &filter);
-	};
-}
diff --git a/kcov-38/src/include/configuration.hh b/kcov-38/src/include/configuration.hh
deleted file mode 100644
index 04c54c3c5cf8..000000000000
--- a/kcov-38/src/include/configuration.hh
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma once
-
-#include <string>
-#include <list>
-#include <vector>
-
-namespace kcov
-{
-	/**
-	 * Class that hold kcov configuration (command line options)
-	 */
-	class IConfiguration
-	{
-	public:
-		typedef enum
-		{
-			MODE_COLLECT_ONLY       = 1,
-			MODE_REPORT_ONLY        = 2,
-			MODE_COLLECT_AND_REPORT = 3,
-			MODE_MERGE_ONLY         = 4,
-			MODE_SYSTEM_RECORD      = 5,
-			MODE_SYSTEM_REPORT      = 6,
-		} RunMode_t;
-
-		class IListener
-		{
-		public:
-			virtual ~IListener()
-			{
-			}
-
-			/**
-			 * Callback for configuration changes.
-			 *
-			 * Listeners will receive this call on each configuration change. The
-			 * call is made from a configuration thread, so watch out with races.
-			 *
-			 * @param key the name of the setting
-			 */
-			virtual void onConfigurationChanged(const std::string &key) = 0;
-		};
-		typedef std::vector<IListener *> ConfigurationListener_t;
-
-
-		virtual ~IConfiguration() {}
-
-
-		/**
-		 * Print kcov usage.
-		 */
-		virtual void printUsage() = 0;
-
-
-		/**
-		 * Return a value as a string.
-		 *
-		 * Will panic if the key is not present.
-		 *
-		 * @param key the key to lookup
-		 *
-		 * @return the string value
-		 */
-		virtual const std::string &keyAsString(const std::string &key) = 0;
-
-		/**
-		 * Return a value as an integer.
-		 *
-		 * Will panic if the key is not present.
-		 *
-		 * @param key the key to lookup
-		 *
-		 * @return the integer value
-		 */
-		virtual int keyAsInt(const std::string &key) = 0;
-
-		/**
-		 * Return a value as a string list.
-		 *
-		 * Will panic if the key is not present.
-		 *
-		 * @param key the key to lookup
-		 *
-		 * @return the values as a list, potentially empty
-		 */
-		virtual const std::vector<std::string> &keyAsList(const std::string &key) = 0;
-
-		/**
-		 * Set a key. Use these with caution.
-		 */
-		virtual void setKey(const std::string &key, const std::string &val) = 0;
-
-		virtual void setKey(const std::string &key, int val) = 0;
-
-		virtual void setKey(const std::string &key, const std::vector<std::string> &val) = 0;
-
-		/**
-		 * Return the coveree argv (i.e., without kcov and kcov options)
-		 *
-		 * @return The coveree argv
-		 */
-		virtual const char **getArgv() = 0;
-
-		/**
-		 * Return the coveree argc (i.e., without kcov and kcov options)
-		 *
-		 * @return The coveree argc
-		 */
-		virtual unsigned int getArgc() = 0;
-
-		/**
-		 * Register a configuration-changed listener
-		 *
-		 * @param listener the listener to call on changes
-		 * @param keys the keys to listen for
-		 */
-		virtual void registerListener(IListener &listener, const std::vector<std::string> &keys) = 0;
-
-
-		/**
-		 * Parse argc, argv and setup the configuration
-		 *
-		 * @return true if the configuration is OK
-		 */
-		virtual bool parse(unsigned int argc, const char *argv[]) = 0;
-
-		static IConfiguration &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/disassembler.hh b/kcov-38/src/include/disassembler.hh
deleted file mode 100644
index c28e74cf7a99..000000000000
--- a/kcov-38/src/include/disassembler.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <vector>
-
-namespace kcov
-{
-	class IDisassembler
-	{
-	public:
-		virtual ~IDisassembler()
-		{
-		}
-
-		/**
-		 * Setup the verifier with an ELF file header
-		 */
-		virtual void setup(const void *header, size_t headerSize) = 0;
-
-		/**
-		 * Add an executable section
-		 *
-		 * @param sectionData the data of the section
-		 * @param sectionSize the size of the section
-		 * @param base address the virtual start address
-		 */
-		virtual void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress) = 0;
-
-		/**
-		 * Check if an address is a valid breakpoint "point".
-		 *
-		 * @return true if a breakpoint can be set on this address
-		 */
-		virtual bool verify(uint64_t address) = 0;
-
-
-		/**
-		 * Lookup the basic block for an address.
-		 *
-		 * @return a list of instructions in this basic block
-		 */
-		virtual const std::vector<uint64_t> &getBasicBlock(uint64_t address) = 0;
-
-		static IDisassembler &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/elf.hh b/kcov-38/src/include/elf.hh
deleted file mode 100644
index 0fdd4fdf6dba..000000000000
--- a/kcov-38/src/include/elf.hh
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include <utils.hh>
-
-#include <vector>
-#include <utility>
-#include <string>
-
-// Add symbols missing from FreeBSD's elfutils.
-#ifndef ELF_NOTE_GNU
-#define ELF_NOTE_GNU "GNU"
-#endif
-#ifndef NT_GNU_BUILD_ID
-#define NT_GNU_BUILD_ID 3
-#endif
-
-namespace kcov
-{
-
-	/**
-	 * Holder class for address segments
-	 */
-	class Segment
-	{
-	public:
-		Segment(const void *data, uint64_t paddr, uint64_t vaddr, uint64_t size) :
-			m_data(NULL), m_paddr(paddr), m_vaddr(vaddr), m_size(size)
-		{
-			if (data)
-			{
-				m_data = xmalloc(size);
-				memcpy(m_data, data, size);
-			}
-		}
-
-		Segment(const Segment &other) :
-			m_data(NULL), m_paddr(other.m_paddr), m_vaddr(other.m_vaddr), m_size(other.m_size)
-		{
-			if (other.m_data)
-			{
-				m_data = xmalloc(other.m_size);
-				memcpy(m_data, other.m_data, other.m_size);
-			}
-		}
-
-		~Segment()
-		{
-			free(m_data);
-		}
-
-		/**
-		 * Check if an address is contained within this segment
-		 *
-		 * @param addr the address to check
-		 *
-		 * @return true if valid
-		 */
-		bool addressIsWithinSegment(uint64_t addr) const
-		{
-			return addr >= m_paddr && addr < m_paddr + m_size;
-		}
-
-		/**
-		 * Adjust an address with the segment.
-		 *
-		 * @param addr the address to adjust
-		 *
-		 * @return the new address
-		 */
-		uint64_t adjustAddress(uint64_t addr) const
-		{
-			if (addressIsWithinSegment(addr))
-				return addr - m_paddr + m_vaddr;
-
-			return addr;
-		}
-
-		uint64_t getBase() const
-		{
-			return m_vaddr;
-		}
-
-		const void *getData() const
-		{
-			return m_data;
-		}
-
-		size_t getSize() const
-		{
-			return m_size;
-		}
-
-	private:
-		void *m_data;
-
-		// Should really be const, but GCC 4.6 doesn't like that
-		uint64_t m_paddr;
-		uint64_t m_vaddr;
-		size_t m_size;
-	};
-
-
-	class IElf
-	{
-	public:
-		virtual ~IElf()
-		{
-		}
-
-		virtual const std::vector<std::string> &getGcovGcnoFiles() = 0;
-
-		virtual const std::vector<std::string> &getGcovGcdaFiles() = 0;
-
-		virtual const std::string &getBuildId() = 0;
-
-		/**
-		 * Return the debug link string and the CRC
-		 *
-		 * @return the debug link or NULL if there are none
-		 */
-		virtual const std::pair<std::string, uint32_t> *getDebugLink() = 0;
-
-		virtual const std::vector<Segment> &getSegments() = 0;
-
-		virtual void *getRawData(size_t &sz) = 0;
-
-		static IElf *create(const std::string &filename);
-	};
-}
diff --git a/kcov-38/src/include/engine.hh b/kcov-38/src/include/engine.hh
deleted file mode 100644
index 88c973acd08e..000000000000
--- a/kcov-38/src/include/engine.hh
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-#include <manager.hh>
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <string>
-
-namespace kcov
-{
-	class IFileParser;
-
-	enum event_type
-	{
-		ev_error       = -1,
-		ev_breakpoint  =  1,
-		ev_signal      =  2,
-		ev_exit        =  3,
-		ev_exit_first_process = 4,
-		ev_signal_exit =  5,
-	};
-
-	/**
-	 * An "engine" which can run programs and collect events (e.g., breakpoints)
-	 */
-	class IEngine
-	{
-	public:
-		class Event
-		{
-		public:
-			Event(enum event_type type = ev_signal, int data = 0, uint64_t address = 0) :
-				type(type),
-				data(data),
-				addr(address)
-			{
-			}
-
-			enum event_type type;
-
-			int data; // Typically the breakpoint
-			uint64_t addr;
-		};
-
-		class IEventListener
-		{
-		public:
-			virtual void onEvent(const Event &ev) = 0;
-		};
-
-
-		virtual ~IEngine() {}
-
-		/**
-		 * Set a breakpoint
-		 *
-		 * @param addr the address to set the breakpoint on
-		 *
-		 * @return the ID of the breakpoint, or -1 on failure
-		 */
-		virtual int registerBreakpoint(unsigned long addr) = 0;
-
-		/**
-		 * Fork a new process and attach to it
-		 *
-		 * @return true if OK, false otherwise
-		 */
-		virtual bool start(IEventListener &listener, const std::string &executable) = 0;
-
-		/**
-		 * Kill child with signal
-		 *
-		 * @param sig the signal to send to the child
-		 */
-		virtual void kill(int sig) = 0;
-
-		/**
-		 * Continue execution with an event
-		 *
-		 * @return true if the process should continue, false otherwise
-		 */
-		virtual bool continueExecution() = 0;
-	};
-
-	/**
-	 * Factory class for getting one of multiple engines, which can
-	 * match different file types.
-	 */
-	class IEngineFactory
-	{
-	public:
-		class IEngineCreator
-		{
-		public:
-			IEngineCreator();
-
-			virtual IEngine *create() = 0;
-
-			/**
-			 * See if a particular file can be matched with this engine.
-			 *
-			 * Should return how well this engine fits, the higher the better
-			 *
-			 * @param filename the name of the file
-			 * @param data the first few bytes of the file
-			 * @param dataSize the size of @a data
-			 */
-			virtual unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize) = 0;
-		};
-
-		typedef IEngine *(*EngineCreator_t)(IFileParser &parser);
-
-		virtual ~IEngineFactory()
-		{
-		}
-
-		virtual void registerEngine(IEngineCreator &creator) = 0;
-
-		virtual IEngineCreator &matchEngine(const std::string &file) = 0;
-
-		static IEngineFactory &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/file-parser.hh b/kcov-38/src/include/file-parser.hh
deleted file mode 100644
index 516c6556fb57..000000000000
--- a/kcov-38/src/include/file-parser.hh
+++ /dev/null
@@ -1,184 +0,0 @@
-#pragma once
-
-#include <manager.hh>
-
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-#include <vector>
-
-#include <utils.hh>
-
-struct phdr_data_entry;
-
-namespace kcov
-{
-	class IFilter;
-
-	class IFileParser
-	{
-	public:
-		enum FileFlags
-		{
-			FLG_NONE = 0,
-			FLG_TYPE_SOLIB = 1,
-			FLG_TYPE_COVERAGE_DATA = 2, //< Typically gcov data files
-		};
-
-		enum PossibleHits
-		{
-			HITS_SINGLE,     //< Yes/no (merge-parser)
-			HITS_LIMITED,    //< E.g., multiple branches
-			HITS_UNLIMITED,  //< Accumulated (Python/bash)
-		};
-
-		/**
-		 * Holder class for files (e.g., ELF binaries)
-		 */
-		class File
-		{
-		public:
-			File(const std::string &filename, const enum FileFlags flags = FLG_NONE) :
-				m_filename(filename), m_flags(flags)
-			{
-			}
-
-			const std::string m_filename;
-			const enum FileFlags m_flags;
-		};
-
-		virtual ~IFileParser() {}
-
-		/**
-		 * Listener for lines (lines in source files)
-		 *
-		 * This is the main way the (file,lineNr) -> address map is handled.
-		 */
-		class ILineListener
-		{
-		public:
-			virtual void onLine(const std::string &file, unsigned int lineNr,
-					uint64_t addr) = 0;
-		};
-
-		/**
-		 * Listener for added files (typically an ELF binary)
-		 */
-		class IFileListener
-		{
-		public:
-			virtual void onFile(const File &file) = 0;
-		};
-
-		/**
-		 * Add a file to the parser
-		 *
-		 * @param filename the filename to add
-		 * @param phdr_data base address data for solibs
-		 *
-		 * @return true if the file could be added, false otherwise
-		 */
-		virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data = 0) = 0;
-
-		/**
-		 * Set the relocation of the main file for the position-independent executable (PIE) support
-		 *
-		 * PIEs have, like shared objects, an unknown load address which can only be
-		 * retrieved from the solib handler. Because of this the parser may defer
-		 * onFile and onLine notifications before this call.
-		 *
-		 * This method, if any, should be called after the initial parse call and
-		 * beefore the following addFile calls for solibs.
-		 *
-		 * @param relocation relocation offset
-		 *
-		 * @return true if the relocation is properly set, false otherwise
-		 */
-		virtual bool setMainFileRelocation(unsigned long relocation) = 0;
-
-		/**
-		 * Register a listener for source lines.
-		 *
-		 * Will be called when new source file/line pairs are found
-		 *
-		 * @param listener the listener
-		 */
-		virtual void registerLineListener(ILineListener &listener) = 0;
-
-		/**
-		 * Register a listener for coveree files.
-		 *
-		 * Will be called when new ELF binary (typically) is added
-		 *
-		 * @param listener the listener
-		 */
-		virtual void registerFileListener(IFileListener &listener) = 0;
-
-		/**
-		 * Parse the added files
-		 *
-		 * @return true if parsing could be done
-		 */
-		virtual bool parse() = 0;
-
-		/**
-		 * Get the checksum of the main file (not solibs)
-		 *
-		 * @return the file checksum
-		 */
-		virtual uint64_t getChecksum() = 0;
-
-		/**
-		 * Get the name of the parser
-		 *
-		 * @return the name
-		 */
-		virtual std::string getParserType() = 0;
-
-
-		/**
-		 * Return if this parser is of the multiple type (i.e., relying on
-		 * breakpoints which are cleared after hit, but can have branches),
-		 * or if every address can occur multiple times, or if only
-		 * covered/non-covered is possible.
-		 *
-		 * @return the possible hits of this parser
-		 */
-		virtual enum PossibleHits maxPossibleHits() = 0;
-
-		/**
-		 * See if a particular file can be matched with this parser.
-		 *
-		 * Should return how well this parser fits, the higher the better
-		 *
-		 * @param filename the name of the file
-		 * @param data the first few bytes of the file
-		 * @param dataSize the size of @a data
-		 */
-		virtual unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize) = 0;
-
-		// Setup once the parser has been chosen
-		virtual void setupParser(IFilter *filter) = 0;
-	};
-
-
-	/**
-	 * Manager class for getting one of multiple parsers, which can
-	 * match different file types.
-	 */
-	class IParserManager
-	{
-	public:
-		virtual ~IParserManager()
-		{
-		}
-
-		virtual void registerParser(IFileParser &parser) = 0;
-
-		virtual IFileParser *matchParser(const std::string &file) = 0;
-
-		static IParserManager &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/filter.hh b/kcov-38/src/include/filter.hh
deleted file mode 100644
index 9f23583d02e2..000000000000
--- a/kcov-38/src/include/filter.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace kcov
-{
-	/**
-	 * Class for filtering output data.
-	 *
-	 * Used for the --include-path and --include-pattern command line options.
-	 */
-	class IFilter
-	{
-	public:
-		class Handler
-		{
-		public:
-			virtual bool includeFile(const std::string &file) = 0;
-		};
-
-		/**
-		 * Run filters on @a path.
-		 *
-		 * @param path the path to check
-		 *
-		 * @return true if this path should be included in the output, false otherwise.
-		 */
-		virtual bool runFilters(const std::string &path) = 0;
-
-		/**
-		 * Run filters on file/line pair.
-		 *
-		 * @param path the path to check
-		 *
-		 * @return true if this path should be included in the output, false otherwise.
-		 */
-		virtual bool runLineFilters(const std::string &filePath,
-				unsigned int lineNr,
-				const std::string &line) = 0;
-
-		/**
-		 * Convert source path to a real path and (if configured) run replacement
-		 * on parts of the path (if the source has moved).
-		 *
-		 * @param path the path to mangle
-		 *
-		 * @return the mangled path
-		 */
-		virtual std::string mangleSourcePath(const std::string &path) = 0;
-
-		static IFilter &create();
-
-		static IFilter &createBasic();
-
-
-		virtual ~IFilter() {}
-	};
-}
diff --git a/kcov-38/src/include/gcov.hh b/kcov-38/src/include/gcov.hh
deleted file mode 100644
index f7ac9d3851f7..000000000000
--- a/kcov-38/src/include/gcov.hh
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <functional>
-
-struct header;
-
-namespace kcov
-{
-	/**
-	 * Combine basic block/file info into an "address"
-	 *
-	 * @param filename the source filename
-	 * @param function the function to map for
-	 * @param basicBlock the basic block number
-	 * @param lineIndex the index number in the basic block map
-	 */
-	static inline uint64_t gcovGetAddress(const std::string &filename, int32_t function,
-			int32_t basicBlock, int32_t lineIndex)
-	{
-		uint32_t fn16 = ((uint32_t)function) & 0xffff;
-		uint32_t bb16 = ((uint32_t)basicBlock) & 0xffff;
-		uint64_t fnAndBb = (fn16 << 16) | bb16;
-		uint64_t fileNameHash = (((uint64_t)std::hash<std::string>()(filename)) & 0xffffff00ULL);
-		uint64_t lineIndexMask = lineIndex & 0xffULL;
-
-		return (fileNameHash << 32ULL) | (lineIndexMask << 32ULL) | fnAndBb;
-	}
-
-	class GcovParser
-	{
-	public:
-		/**
-		 * Parse the gcov file.
-		 *
-		 * @return true if the file was OK, false otherwise
-		 */
-		bool parse();
-
-	protected:
-		GcovParser(const uint8_t *data, size_t dataSize);
-
-		virtual ~GcovParser();
-
-		virtual bool onRecord(const struct header *header, const uint8_t *data) = 0;
-
-		bool verify();
-
-		const uint8_t *readString(const uint8_t *p, std::string &out);
-
-		// Convenience when using 32-bit pointers
-		const int32_t *readString(const int32_t *p, std::string &out);
-
-
-		const uint8_t *padPointer(const uint8_t *p);
-
-	private:
-		const uint8_t *m_data;
-		size_t m_dataSize;
-	};
-
-	// Specialized parser for gcno files
-	class GcnoParser : public GcovParser
-	{
-	public:
-		// Holder-class for fn/bb -> file/line
-		class BasicBlockMapping
-		{
-		public:
-			int32_t m_function;
-			int32_t m_basicBlock;
-			std::string m_file;
-			int32_t m_line;
-			int32_t m_index;
-
-			BasicBlockMapping(const BasicBlockMapping &other);
-
-			BasicBlockMapping(int32_t function, int32_t basicBlock,
-					const std::string &file, int32_t line, int32_t index);
-		};
-
-		// Holder-class for arcs between blocks
-		class Arc
-		{
-		public:
-			int32_t m_function;
-			int32_t m_srcBlock;
-			int32_t m_dstBlock;
-
-			Arc(const Arc &other);
-
-			Arc(int32_t function, int32_t srcBlock, int32_t dstBlock);
-		};
-
-		typedef std::vector<BasicBlockMapping> BasicBlockList_t;
-		typedef std::vector<int32_t> FunctionList_t;
-		typedef std::vector<Arc> ArcList_t;
-
-
-
-		GcnoParser(const uint8_t *data, size_t dataSize);
-
-		/* Return a reference to the basic blocks to file/line in the file.
-		 * Empty if parse() hasn't been called.
-		 *
-		 * @return the basic blocks
-		 */
-		const BasicBlockList_t &getBasicBlocks();
-
-		/**
-		 * Return a reference to the arcs in the file. Empty if parse() hasn't
-		 * been called.
-		 *
-		 * @return the arcs
-		 */
-		const ArcList_t &getArcs();
-
-		/**
-		 * Return a reference to the function IDs in the file. Empty if parse()
-		 * hasn't been called.
-		 *
-		 * @return the functions
-		 */
-		const FunctionList_t &getFunctions();
-
-	protected:
-		bool onRecord(const struct header *header, const uint8_t *data);
-
-	private:
-		// Handler for record types
-		void onAnnounceFunction(const struct header *header, const uint8_t *data);
-		void onBlocks(const struct header *header, const uint8_t *data);
-		void onLines(const struct header *header, const uint8_t *data);
-		void onArcs(const struct header *header, const uint8_t *data);
-
-		std::string m_file;
-		std::string m_function;
-		int32_t m_functionId;
-		FunctionList_t m_functions;
-		BasicBlockList_t m_basicBlocks;
-		ArcList_t m_arcs;
-	};
-
-	class GcdaParser : public GcovParser
-	{
-	public:
-		GcdaParser(const uint8_t *data, size_t dataSize);
-
-		/**
-		 * Return the number of counters for a particular function.
-		 *
-		 * @param function the function
-		 *
-		 * @return the number of counters, or 0 for invalid functions
-		 */
-		size_t countersForFunction(int32_t function);
-
-		/**
-		 * Return the counter value for a function.
-		 *
-		 * @param function the function
-		 * @param counter the counter number
-		 *
-		 * @return the counter value, or -1 for invalid function/counters
-		 */
-		int64_t getCounter(int32_t function, int32_t counter);
-
-	protected:
-		bool onRecord(const struct header *header, const uint8_t *data);
-
-		void onAnnounceFunction(const struct header *header, const uint8_t *data);
-
-		void onCounterBase(const struct header *header, const uint8_t *data);
-
-		typedef std::vector<int64_t> CounterList_t;
-		typedef std::unordered_map<int32_t, CounterList_t> FunctionToCountersMap_t;
-
-		int32_t m_functionId;
-		FunctionToCountersMap_t m_functionToCounters;
-	};
-}
diff --git a/kcov-38/src/include/generated-data-base.hh b/kcov-38/src/include/generated-data-base.hh
deleted file mode 100644
index 69998d26fc3c..000000000000
--- a/kcov-38/src/include/generated-data-base.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-namespace kcov
-{
-	class GeneratedData
-	{
-	public:
-		GeneratedData(const uint8_t *p, size_t size) :
-			m_data(p), m_size(size)
-		{
-		}
-
-		const uint8_t *data() const
-		{
-			return m_data;
-		}
-
-		const size_t size() const
-		{
-			return m_size;
-		}
-
-	private:
-		const uint8_t *m_data;
-		size_t m_size;
-	};
-}
diff --git a/kcov-38/src/include/lineid.hh b/kcov-38/src/include/lineid.hh
deleted file mode 100644
index 416262ab9009..000000000000
--- a/kcov-38/src/include/lineid.hh
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#include <functional>
-#include <string>
-
-namespace kcov
-{
-	static uint64_t getLineId(const std::string &fileName, unsigned int nr)
-	{
-		return (std::hash<std::string>()(fileName) & 0xffffffff) | ((uint64_t)nr << 32ULL);
-	}
-}
diff --git a/kcov-38/src/include/manager.hh b/kcov-38/src/include/manager.hh
deleted file mode 100644
index d28fe8ec0acc..000000000000
--- a/kcov-38/src/include/manager.hh
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	enum match_type
-	{
-		match_none = 0,
-		match_perfect = 0xffffffff,
-	};
-}
diff --git a/kcov-38/src/include/output-handler.hh b/kcov-38/src/include/output-handler.hh
deleted file mode 100644
index 634ffaf00f2d..000000000000
--- a/kcov-38/src/include/output-handler.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace kcov
-{
-	class IWriter;
-	class IReporter;
-	class IFileParser;
-	class ICollector;
-
-	class IOutputHandler
-	{
-	public:
-		virtual ~IOutputHandler() {}
-
-		virtual void registerWriter(IWriter &writer) = 0;
-
-		virtual void start() = 0;
-
-		virtual void stop() = 0;
-
-		virtual void produce() = 0;
-
-
-		virtual const std::string &getBaseDirectory() = 0;
-
-		virtual const std::string &getOutDirectory() = 0;
-
-		static IOutputHandler &create(IReporter &reporter, ICollector *collector);
-
-		static IOutputHandler &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/phdr_data.h b/kcov-38/src/include/phdr_data.h
deleted file mode 100644
index a023c14ebef4..000000000000
--- a/kcov-38/src/include/phdr_data.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct phdr_data_segment
-{
-	unsigned long paddr;
-	unsigned long vaddr;
-	unsigned long size;
-};
-
-struct phdr_data_entry
-{
-	char name[1024];
-	uint32_t n_segments;
-
-	// "Reasonable" max
-	struct phdr_data_segment segments[64];
-};
-
-struct phdr_data
-{
-	uint32_t magic;
-	uint32_t version;
-	unsigned long relocation; // for PIE
-	uint32_t n_entries;
-
-	struct phdr_data_entry entries[];
-};
-
-struct dl_phdr_info;
-
-struct phdr_data *phdr_data_new(size_t size);
-
-void phdr_data_add(struct phdr_data *p, struct dl_phdr_info *info);
-
-void *phdr_data_marshal(struct phdr_data *p, size_t *out_sz);
-
-void phdr_data_free(struct phdr_data *p);
-
-struct phdr_data *phdr_data_unmarshal(void *p);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/kcov-38/src/include/reporter.hh b/kcov-38/src/include/reporter.hh
deleted file mode 100644
index bc058e69c39b..000000000000
--- a/kcov-38/src/include/reporter.hh
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include <stddef.h>
-
-namespace kcov
-{
-	class IFileParser;
-	class ICollector;
-	class IFilter;
-
-	/**
-	 * Interface class that reports addresses pairs being executed.
-	 *
-	 * Can also be queried for code lines etc.
-	 */
-	class IReporter
-	{
-	public:
-		class LineExecutionCount
-		{
-		public:
-			LineExecutionCount(unsigned int hits, unsigned int possibleHits, uint64_t order) :
-				m_hits(hits), m_possibleHits(possibleHits), m_order(order)
-			{
-			}
-
-			unsigned int m_hits;
-			unsigned int m_possibleHits;
-			uint64_t m_order;
-		};
-
-		class ExecutionSummary
-		{
-		public:
-			ExecutionSummary() : m_lines(0), m_executedLines(0), m_includeInTotals(true)
-			{
-			}
-
-			ExecutionSummary(unsigned int lines, unsigned int executedLines) :
-				m_lines(lines), m_executedLines(executedLines), m_includeInTotals(true)
-			{
-			}
-
-			unsigned int m_lines;
-			unsigned int m_executedLines;
-			unsigned int m_includeInTotals;
-		};
-
-		/**
-		 * Listener to executed addresses.
-		 */
-		class IListener
-		{
-		public:
-			/**
-			 * An address has been executed by the covered program. Can also
-			 * report data from previous runs.
-			 *
-			 * @param addr the executed address
-			 * @param hits the number of hits of the address (typically 1)
-			 */
-			virtual void onAddress(uint64_t addr, unsigned long hits) = 0;
-
-			/**
-			 * Re-report on-lines from the file-parser.
-			 *
-			 * The address can be changed by the reporter, so this will match
-			 * onAddress above.
-			 *
-			 * @param file the source file
-			 * @param lineNr the line number in @a file
-			 * @param addr the (hashed) address for this file/line combination
-			 */
-			virtual void onLineReporter(const std::string &file, unsigned int lineNr, uint64_t addr) {}
-		};
-
-		virtual ~IReporter() {}
-
-
-		/**
-		 * Register a listener for reported addresses.
-		 *
-		 * @param listener the listener
-		 */
-		virtual void registerListener(IListener &listener) = 0;
-
-		/**
-		 * Return if a file path should be included in the output.
-		 *
-		 * @param file the file path to check
-		 *
-		 * @return true if the file should be included in the output
-		 */
-		virtual bool fileIsIncluded(const std::string &file) = 0;
-
-		/**
-		 * Returns if a file/line pair contains executable code.
-		 *
-		 * @param file the filename
-		 * @param lineNr the line number in the file
-		 *
-		 * @return true if this is executable code, false otherwise
-		 */
-		virtual bool lineIsCode(const std::string &file, unsigned int lineNr) = 0;
-
-		/**
-		 * Get the execution count for a file:line pair
-		 *
-		 * @param file the filename to check
-		 * @param lineNr the line to check
-		 *
-		 * @return the execution count
-		 */
-		virtual LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr) = 0;
-
-		/**
-		 * Get a summary of what has been executed so far
-		 *
-		 * @return the summary
-		 */
-		virtual ExecutionSummary getExecutionSummary() = 0;
-
-		virtual void writeCoverageDatabase() = 0;
-
-		static IReporter &create(IFileParser &elf, ICollector &collector, IFilter &filter);
-		static IReporter &createDummyReporter();
-	};
-}
diff --git a/kcov-38/src/include/solib-handler.hh b/kcov-38/src/include/solib-handler.hh
deleted file mode 100644
index 75606d9c2834..000000000000
--- a/kcov-38/src/include/solib-handler.hh
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <engine.hh>
-#include <collector.hh>
-
-namespace kcov
-{
-	class ISolibHandler
-	{
-	public:
-		virtual ~ISolibHandler()
-		{
-		}
-
-		virtual void startup() = 0;
-	};
-
-	ISolibHandler &createSolibHandler(IFileParser &parser, ICollector &collector);
-
-	// Wait for the solib thread to finish parsing the solib data
-	void blockUntilSolibDataRead();
-}
diff --git a/kcov-38/src/include/source-file-cache.hh b/kcov-38/src/include/source-file-cache.hh
deleted file mode 100644
index c0cb00ee213f..000000000000
--- a/kcov-38/src/include/source-file-cache.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-
-namespace kcov
-{
-	/**
-	 * Cache class for source code
-	 */
-	class ISourceFileCache
-	{
-	public:
-		virtual ~ISourceFileCache()
-		{
-		}
-
-		/**
-		 * Get the source lines of a file
-		 *
-		 * @param filePath the file to lookup
-		 *
-		 * @return A reference to the source lines (possibly empty)
-		 */
-		virtual const std::vector<std::string> &getLines(const std::string &filePath) = 0;
-
-		/**
-		 * Get the checksum for a file
-		 *
-		 * @return the CRC32 of the file
-		 */
-		virtual uint32_t getCrc(const std::string &filePath) = 0;
-
-		virtual bool fileExists(const std::string &filePath) = 0;
-
-		static ISourceFileCache &getInstance();
-	};
-}
diff --git a/kcov-38/src/include/swap-endian.hh b/kcov-38/src/include/swap-endian.hh
deleted file mode 100644
index d79d4979f4bb..000000000000
--- a/kcov-38/src/include/swap-endian.hh
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-
-#include <stdlib.h>
-#include <stdint.h>
-
-// From http://stackoverflow.com/questions/105252/how-do-i-convert-between-big-endian-and-little-endian-values-in-c
-template <typename T>
-T swap_endian(T u)
-{
-	union
-	{
-		T u;
-		unsigned char u8[sizeof(T)];
-	} source, dest;
-
-	source.u = u;
-
-	for (size_t k = 0; k < sizeof(T); k++)
-		dest.u8[k] = source.u8[sizeof(T) - k - 1];
-
-	return dest.u;
-}
-
-
-static inline bool cpu_is_little_endian()
-{
-	static const uint16_t data = 0x1122;
-	const uint8_t *p = (uint8_t *)&data;
-
-	return p[0] == 0x22;
-}
-
-template <typename T>
-T to_be(T u)
-{
-	if (cpu_is_little_endian())
-		return swap_endian<T>(u);
-	else
-		return u;
-}
-
-template <typename T>
-T to_le(T u)
-{
-	if (cpu_is_little_endian())
-		return u;
-	else
-		return swap_endian<T>(u);
-}
-
-template <typename T>
-T be_to_host(T u)
-{
-	if (cpu_is_little_endian())
-		return swap_endian<T>(u);
-	else
-		return u;
-}
-
-template <typename T>
-T le_to_host(T u)
-{
-	if (cpu_is_little_endian())
-		return u;
-	else
-		return swap_endian<T>(u);
-}
diff --git a/kcov-38/src/include/system-mode/file-data.hh b/kcov-38/src/include/system-mode/file-data.hh
deleted file mode 100644
index eb93efd45a03..000000000000
--- a/kcov-38/src/include/system-mode/file-data.hh
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <string>
-#include <vector>
-
-/* Data is always 8-byte aligned, and the trailer as well */
-struct trailer
-{
-	uint32_t magic;
-	uint32_t version;
-	uint32_t compressed_size;
-	uint32_t uncompressed_size;
-	uint32_t id;
-
-	uint32_t filename_size; // NULL-terminated, 8-byte aligned string
-	uint32_t options_size;  // Ditto, after filename
-
-	uint16_t n_entries;
-};
-
-const static uint32_t TRAILER_MAGIC = 0x19992000;
-const static uint32_t TRAILER_VERSION = 1;
-
-namespace kcov
-{
-	class SystemModeFile
-	{
-	public:
-		~SystemModeFile();
-
-		void addEntry(uint32_t index, uint64_t value);
-
-		/**
-		 * Get processed data, allocated with malloc.
-		 */
-		const void *getProcessedData(size_t &outSize) const;
-
-		const std::string &getOptions() const;
-
-		uint32_t getId() const;
-
-		const std::string &getFilename() const;
-
-		const std::vector<uint64_t> &getEntries() const;
-
-		static SystemModeFile *fromRawFile(uint32_t id, const std::string &filename, const std::string &options,
-				const void *fileData, size_t fileSize);
-		static SystemModeFile *fromProcessedFile(const void *fileData, size_t fileSize);
-
-	private:
-		SystemModeFile();
-
-		bool parse(const void *fileData, size_t fileSize, bool isRaw);
-
-		std::string m_filename;
-		std::string m_options;
-		uint32_t m_id;
-		void *m_data;
-		size_t m_fileSize;
-
-		std::vector<uint64_t> m_entries;
-	};
-};
diff --git a/kcov-38/src/include/system-mode/registration.hh b/kcov-38/src/include/system-mode/registration.hh
deleted file mode 100644
index 216aa860c37e..000000000000
--- a/kcov-38/src/include/system-mode/registration.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#include <string>
-
-struct new_process_entry
-{
-	uint32_t magic;
-	uint32_t version;
-
-	uint16_t entry_size;
-	uint16_t pid;
-
-	char filename[];
-};
-
-const static uint32_t NEW_PROCES_MAGIC = 0x76817812;
-const static uint32_t NEW_PROCES_VERSION = 1;
-
-bool parseProcessEntry(struct new_process_entry *p, uint16_t &outPid, std::string &outFilename);
-
-struct new_process_entry *createProcessEntry(uint16_t pid, const std::string &filename);
diff --git a/kcov-38/src/include/utils.hh b/kcov-38/src/include/utils.hh
deleted file mode 100644
index 81280708e557..000000000000
--- a/kcov-38/src/include/utils.hh
+++ /dev/null
@@ -1,212 +0,0 @@
-#pragma once
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <semaphore.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <zlib.h>
-
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <list>
-
-#define error(x...) do \
-{ \
-	fprintf(stderr, "kcov: error: "); \
-	fprintf(stderr, x); \
-	fprintf(stderr, "\n"); \
-} while(0)
-
-#define warning(x...) do \
-{ \
-	fprintf(stderr, "kcov: warning: "); \
-	fprintf(stderr, x); \
-	fprintf(stderr, "\n"); \
-} while(0)
-
-#define panic(x...) do \
-{ \
-	error(x); \
-	exit(1); \
-} while(0)
-
-enum debug_mask
-{
-	INFO_MSG   =   1,
-	ENGINE_MSG =   2,
-	ELF_MSG    =   4,
-	BP_MSG     =   8,
-	STATUS_MSG =  16,
-};
-extern int g_kcov_debug_mask;
-
-static inline void kcov_debug(enum debug_mask dbg, const char *fmt, ...) __attribute__((format(printf,2,3)));
-
-static inline void kcov_debug(enum debug_mask dbg, const char *fmt, ...)
-{
-	va_list ap;
-
-	if ((g_kcov_debug_mask & dbg) == 0)
-		return;
-
-	va_start(ap, fmt);
-	vfprintf(stdout, fmt, ap);
-	va_end(ap);
-}
-
-#define panic_if(cond, x...) \
-		do { if ((cond)) panic(x); } while(0)
-
-static inline char *xstrdup(const char *s)
-{
-	char *out = strdup(s);
-
-	panic_if(!out, "strdup failed");
-
-	return out;
-}
-
-static inline void *xmalloc(size_t sz)
-{
-  void *out = malloc(sz);
-
-  panic_if(!out, "malloc failed");
-  memset(out, 0, sz);
-
-  return out;
-}
-
-static inline void *xrealloc(void *p, size_t sz)
-{
-  void *out = realloc(p, sz);
-
-  panic_if(!out, "realloc failed");
-
-  return out;
-}
-
-extern int write_file(const void *data, size_t len, const char *fmt, ...) __attribute__((format(printf,3,4)));
-
-extern void *read_file(size_t *out_size, const char *fmt, ...) __attribute__((format(printf,2,3)));
-
-extern void *peek_file(size_t *out_size, const char *fmt, ...) __attribute__((format(printf,2,3)));
-
-extern std::string dir_concat(const std::string &dir, const std::string &filename);
-
-#define xwrite_file(data, len, dir...) do { \
-	int r = write_file(data, len, dir); \
-	panic_if (r != 0, "write_file failed with %d\n", r); \
-} while(0)
-
-#define xsnprintf(buf, size, fmt, x...) do { \
-    int r = snprintf(buf, size, fmt, x); \
-    panic_if(r < 0 || r >= (int)(size), "snprintf failed for %s with %d\n", fmt, r); \
-} while(0)
-
-
-extern bool file_exists(const std::string &path);
-
-extern bool executable_exists_in_path(const std::string &path);
-
-extern uint64_t get_file_timestamp(const std::string &path);
-
-extern int concat_files(const char *dst, const char *file_a, const char *file_b);
-
-extern const char *get_home();
-
-/**
- * Return true if a FILE * is readable without blocking.
- *
- * @param fp the file to read
- * @param ms the number of milliseconds to wait
- *
- * @return true if the file can be read without blocking, false otherwise
- */
-bool file_readable(FILE *fp, unsigned int ms);
-
-unsigned long get_aligned(unsigned long addr);
-
-unsigned long get_aligned_4b(unsigned long addr);
-
-
-std::string fmt(const char *fmt, ...) __attribute__((format(printf,1,2)));
-
-void mdelay(unsigned int ms);
-
-uint64_t get_ms_timestamp(void);
-
-bool machine_is_64bit(void);
-
-std::vector<std::string> split_string(const std::string &s, const char *delims);
-
-std::string trim_string(const std::string &strIn, const std::string &trimEndChars = " \t\n\r");
-
-const std::string &get_real_path(const std::string &path);
-
-// Split into path / filename
-std::pair<std::string, std::string> split_path(const std::string &pathStr);
-
-bool string_is_integer(const std::string &str, unsigned base = 0);
-
-int64_t string_to_integer(const std::string &str, unsigned base = 0);
-
-std::string escape_html(const std::string &str);
-
-std::string escape_json(const std::string &str);
-
-void msleep(uint64_t ms);
-
-class Semaphore
-{
-private:
-	sem_t *m_sem;
-    std::string m_name;
-    
-public:
-	Semaphore(int initial = 1)
-	{
-		m_name = fmt("/kcov-sem.%p", this);
-
-		m_sem = sem_open(m_name.c_str(), O_CREAT, 0644, initial);
-        if (!m_sem)
-            panic("Can't create semaphore");
-	}
-
-	~Semaphore()
-	{
-		sem_close(m_sem);
-        sem_unlink(m_name.c_str());
-	}
-
-	void notify()
-	{
-		sem_post(m_sem);
-	}
-
-	void wait()
-	{
-		sem_wait(m_sem);
-	}
-};
-
-// Unit test stuff
-void mock_read_file(void *(*callback)(size_t *out_size, const char *path));
-
-void mock_write_file(int (*callback)(const void *data, size_t size, const char *path));
-
-void mock_file_exists(bool (*callback)(const std::string &path));
-
-void mock_get_file_timestamp(uint64_t (*callback)(const std::string &path));
-
-
-static inline uint32_t hash_block(const void *buf, size_t len)
-{
-	return crc32(0, (const Bytef *)buf, len);
-}
diff --git a/kcov-38/src/include/writer.hh b/kcov-38/src/include/writer.hh
deleted file mode 100644
index a85ede0de721..000000000000
--- a/kcov-38/src/include/writer.hh
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-
-	/**
-	 * Class that writes output (HTML, Cobertura, ...)
-	 */
-	class IWriter
-	{
-	public:
-		virtual ~IWriter() {}
-
-		/**
-		 * Called once on startup to setup the writer.
-		 */
-		virtual void onStartup() = 0;
-
-		/**
-		 * Called once on termination to shutdown the writer.
-		 */
-		virtual void onStop() = 0;
-
-		/**
-		 * Write current data.
-		 *
-		 * Called in regular intervals during execution.
-		 */
-		virtual void write() = 0;
-	};
-}
diff --git a/kcov-38/src/kernel/Makefile b/kcov-38/src/kernel/Makefile
deleted file mode 100644
index ee6d69435331..000000000000
--- a/kcov-38/src/kernel/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-
-CFLAGS_kprobe-coverage.o += -g3
-
-obj-m += kprobe-coverage.o
-
-default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-clean:
-	rm -f *.o *.ko *.order *.symvers *.mod.c
diff --git a/kcov-38/src/kernel/kprobe-coverage.c b/kcov-38/src/kernel/kprobe-coverage.c
deleted file mode 100644
index 9ed1edeaf7e4..000000000000
--- a/kcov-38/src/kernel/kprobe-coverage.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * lib/kprobe-coverage.c
- *
- * Copyright (C) 2014 Simon Kagstrom
- *
- * Author: Simon Kagstrom <simon.kagstrom@gmail.com>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- */
-#include <linux/module.h>
-#include <linux/kprobes.h>
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/debugfs.h>
-#include <linux/workqueue.h>
-#include <linux/wait.h>
-#include <linux/fs.h>
-#include <linux/vmalloc.h>
-#include <linux/slab.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>
-
-struct kprobe_coverage
-{
-	struct dentry *debugfs_root;
-
-	struct workqueue_struct *workqueue;
-	wait_queue_head_t wait_queue;
-
-	/* Each coverage entry is on exactly one of these lists */
-	struct list_head deferred_list; /* Probes for not-yet-loaded-modules */
-
-	struct list_head pending_list;  /* Probes which has not yet triggered */
-	struct list_head hit_list;      /* Triggered probes awaiting readout */
-
-	const char *module_names[32];
-	unsigned int name_count;
-
-	struct mutex lock;
-};
-
-struct kprobe_coverage_entry
-{
-	struct kprobe kp;
-	int name_index; /* an index into the name table above (0 is always the kernel */
-	unsigned long base_addr;
-
-	struct list_head lh;
-	struct work_struct work;
-};
-
-static struct kprobe_coverage *global_kpc;
-
-/* Return index into module name vector. Should be called with
- * mutex held. */
-static int module_name_to_index(struct kprobe_coverage *kpc,
-		const char *module_name)
-{
-	int i;
-
-	BUG_ON(!mutex_is_locked(&kpc->lock));
-
-	/* The first is always the kernel (NULL) */
-	if (module_name == NULL)
-		return 0;
-
-	for (i = 1; i < kpc->name_count; i++) {
-		if (strcmp(kpc->module_names[i], module_name) == 0)
-			return i;
-	}
-
-	return -1;
-}
-
-static int kpc_allocate_module_name_index(struct kprobe_coverage *kpc,
-		const char *module_name)
-{
-	int index;
-
-	mutex_lock(&kpc->lock);
-	index = module_name_to_index(kpc, module_name);
-
-	/* Not found? If so allocate new entry unless vector is full */
-	if (index < 0 && kpc->name_count < ARRAY_SIZE(kpc->module_names)) {
-		index = kpc->name_count;
-
-		kpc->module_names[index] = kstrdup(module_name, GFP_KERNEL);
-		kpc->name_count++;
-	}
-	mutex_unlock(&kpc->lock);
-
-	return index;
-
-}
-
-static int kpc_pre_handler(struct kprobe *kp, struct pt_regs *regs)
-{
-	struct kprobe_coverage_entry *entry = (struct kprobe_coverage_entry *)
-					container_of(kp, struct kprobe_coverage_entry, kp);
-
-	/* Schedule it for removal */
-	queue_work(global_kpc->workqueue, &entry->work);
-
-	return 0;
-}
-
-static void kpc_probe_work(struct work_struct *work)
-{
-	struct kprobe_coverage_entry *entry = (struct kprobe_coverage_entry *)
-					container_of(work, struct kprobe_coverage_entry, work);
-	struct kprobe_coverage *kpc = global_kpc;
-
-	unregister_kprobe(&entry->kp);
-
-	/* Move from pending list to the hit list */
-	mutex_lock(&kpc->lock);
-
-	list_del(&entry->lh);
-	list_add_tail(&entry->lh, &kpc->hit_list);
-
-	/* Wake up the listener */
-	wake_up(&kpc->wait_queue);
-
-	mutex_unlock(&kpc->lock);
-}
-
-
-static void free_entry(struct kprobe_coverage_entry *entry)
-{
-	kfree(entry);
-}
-
-static struct kprobe_coverage_entry *new_entry(struct kprobe_coverage *kpc,
-		const char *module_name, struct module *mod, unsigned long where)
-{
-	struct kprobe_coverage_entry *out;
-	unsigned long base_addr = 0;
-
-	out = kzalloc(sizeof(*out), GFP_KERNEL);
-	if (!out)
-		return NULL;
-
-	/* Setup the base address if we know it, otherwise keep at 0 */
-	if (mod)
-		base_addr = (unsigned long)mod->module_core;
-
-	out->name_index = kpc_allocate_module_name_index(kpc, module_name);
-	out->base_addr = base_addr;
-	out->kp.addr = (void *)(base_addr + where);
-	out->kp.pre_handler = kpc_pre_handler;
-	INIT_WORK(&out->work, kpc_probe_work);
-
-	return out;
-}
-
-/* Called with the lock held */
-static int enable_probe(struct kprobe_coverage *kpc,
-		struct kprobe_coverage_entry *entry)
-{
-	int err;
-
-	BUG_ON(!mutex_is_locked(&kpc->lock));
-
-	/* Done before enable_kprobe so that it's really on the list if
-	 * triggered */
-	list_add(&entry->lh, &kpc->pending_list);
-
-	if ( (err = register_kprobe(&entry->kp)) < 0) {
-		list_del(&entry->lh);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/* Called with the lock held */
-static void defer_probe(struct kprobe_coverage *kpc,
-		struct kprobe_coverage_entry *entry)
-{
-	list_add(&entry->lh, &kpc->deferred_list);
-}
-
-static void kpc_add_probe(struct kprobe_coverage *kpc, const char *module_name,
-		unsigned long where)
-{
-	struct module *module = NULL;
-	struct kprobe_coverage_entry *entry;
-	int rv = 0;
-
-	/* Lookup the module which should be instrumented */
-	if (module_name) {
-		preempt_disable();
-		module = find_module(module_name);
-		preempt_enable();
-	}
-
-	entry = new_entry(kpc, module_name, module, where);
-
-	/* Three cases:
-	 *
-	 * 1. pending module - module_name is !NULL, module is NULL: Defer
-	 *    instrumentation
-	 *
-	 * 2. vmlinux - module_name and module is NULL: Instrument directly
-	 *
-	 * 3. loaded module - module_name and module is !NULL: Instrument directly
-	 */
-	mutex_lock(&kpc->lock);
-	if (module_name && !module)
-		defer_probe(kpc, entry);
-	else
-		rv = enable_probe(kpc, entry);
-	mutex_unlock(&kpc->lock);
-
-	/* Probe enabling might fail, just free the entry */
-	if (rv < 0)
-		free_entry(entry);
-}
-
-/* Called with lock held */
-static void clear_list(struct kprobe_coverage *kpc,
-		struct list_head *list, int do_unregister)
-{
-	struct list_head *iter;
-	struct list_head *tmp;
-
-	BUG_ON(!mutex_is_locked(&kpc->lock));
-
-	list_for_each_safe(iter, tmp, list) {
-		struct kprobe_coverage_entry *entry;
-
-		entry = (struct kprobe_coverage_entry *)container_of(iter,
-				struct kprobe_coverage_entry, lh);
-		if (do_unregister)
-			unregister_kprobe(&entry->kp);
-		list_del(&entry->lh);
-		free_entry(entry);
-	}
-}
-
-static void kpc_clear(struct kprobe_coverage *kpc)
-{
-	int i;
-
-	/* Free everything on the lists */
-	mutex_lock(&kpc->lock);
-
-	clear_list(kpc, &kpc->deferred_list, 0);
-	clear_list(kpc, &kpc->hit_list, 1);
-	clear_list(kpc, &kpc->pending_list, 1);
-
-	INIT_LIST_HEAD(&kpc->deferred_list);
-	INIT_LIST_HEAD(&kpc->pending_list);
-	INIT_LIST_HEAD(&kpc->hit_list);
-
-	for (i = 0; i < kpc->name_count; i++) {
-		kfree(kpc->module_names[i]);
-
-		kpc->module_names[i] = NULL;
-	}
-	/* Kernel is still at 0 */
-	kpc->name_count = 1;
-
-	mutex_unlock(&kpc->lock);
-}
-
-static void *kpc_unlink_next(struct kprobe_coverage *kpc)
-{
-	struct kprobe_coverage_entry *entry = NULL;
-
-	/* Remove the next entry, if any */
-	mutex_lock(&kpc->lock);
-	if (!list_empty(&kpc->hit_list)) {
-		entry = list_first_entry(&kpc->hit_list, struct kprobe_coverage_entry, lh);
-		list_del(&entry->lh);
-	}
-	mutex_unlock(&kpc->lock);
-
-	return entry;
-}
-
-static void *kpc_seq_start(struct seq_file *s, loff_t *pos)
-{
-	struct kprobe_coverage *kpc = s->private;
-	int rv;
-
-	 /* Wait for something to arrive on the hit list, abort on signal */
-	rv = wait_event_interruptible(kpc->wait_queue, !list_empty(&kpc->hit_list));
-	if (rv< 0)
-		return NULL;
-
-	return kpc_unlink_next(kpc);
-}
-
-static void *kpc_seq_next(struct seq_file *s, void *v, loff_t *pos)
-{
-	struct kprobe_coverage *kpc = s->private;
-
-	/* Returns NULL if there is nothing more to handle */
-	return kpc_unlink_next(kpc);
-}
-
-static void kpc_seq_stop(struct seq_file *s, void *v)
-{
-}
-
-static int kpc_seq_show(struct seq_file *s, void *v)
-{
-	struct kprobe_coverage *kpc = s->private;
-	struct kprobe_coverage_entry *entry = v;
-	const char *module_name;
-	unsigned long addr;
-
-	/* Lookup the module name from the module table */
-	module_name = kpc->module_names[entry->name_index];
-	addr = (unsigned long)entry->kp.addr - entry->base_addr;
-
-	seq_printf(s, "%s%s0x%016lx\n",
-			module_name ? module_name : "",
-			module_name ? ":" : "",
-			addr);
-
-	free_entry(entry);
-
-	return 0;
-}
-
-static struct seq_operations kpc_seq_ops =
-{
-	.start = kpc_seq_start,
-	.next  = kpc_seq_next,
-	.stop  = kpc_seq_stop,
-	.show  = kpc_seq_show
-};
-
-static int kpc_show_open(struct inode *inode, struct file *file)
-{
-	struct kprobe_coverage *kpc = inode->i_private;
-	int rv;
-
-	rv = seq_open(file, &kpc_seq_ops);
-
-	if (rv == 0) {
-		struct seq_file *s = file->private_data;
-
-		s->private = kpc;
-	}
-
-	return rv;
-}
-
-
-static ssize_t kpc_control_write(struct file *file, const char __user *user_buf,
-		size_t count, loff_t *off)
-{
-	struct kprobe_coverage *kpc = file->private_data;
-	ssize_t out = 0;
-	char *line;
-	char *buf;
-	char *p;
-
-	if (count > PAGE_SIZE)
-		return -E2BIG;
-
-	/* Assure it's NULL terminated */
-	buf = (char *)kzalloc(count + 1, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	if (copy_from_user(buf, user_buf, count)) {
-		kfree(buf);
-		return -EFAULT;
-	}
-	p = buf;
-
-	while ( (line = strsep(&p, "\r\n")) ) {
-		unsigned long addr;
-		char *module = NULL; /* Assume for the kernel */
-		char *colon;
-		char *addr_p;
-		char *endp;
-
-		if (!*line || !p)
-			break;
-
-		out += p - line;
-
-		if (strcmp(line, "clear") == 0) {
-			kpc_clear(kpc);
-			break;
-		}
-		colon = strstr(line, ":");
-		if (colon) {
-			/* For a module */
-			addr_p = colon + 1;
-			*colon = '\0';
-			module = line;
-		} else
-			addr_p = line;
-
-		addr = simple_strtoul(addr_p, &endp, 16);
-		if (endp == addr_p || *endp != '\0')
-			continue;
-
-		kpc_add_probe(kpc, module, addr);
-	}
-
-	kfree(buf);
-	*off += out;
-
-	return out;
-}
-
-static int kpc_control_open(struct inode *inode, struct file *file)
-{
-	file->private_data = inode->i_private; /* kpc */
-
-	return 0;
-}
-
-static void kpc_handle_coming_module(struct kprobe_coverage *kpc,
-		struct module *mod)
-{
-	struct list_head *iter;
-	struct list_head *tmp;
-
-	mutex_lock(&kpc->lock);
-	list_for_each_safe(iter, tmp, &kpc->deferred_list) {
-		struct kprobe_coverage_entry *entry;
-
-		entry = (struct kprobe_coverage_entry *)container_of(iter,
-				struct kprobe_coverage_entry, lh);
-
-		if (module_name_to_index(kpc, mod->name) != entry->name_index)
-			continue;
-
-		/* Move the deferred entry to the pending list and enable */
-		list_del(&entry->lh);
-		entry->base_addr = (unsigned long)mod->module_core;
-		entry->kp.addr += entry->base_addr;
-
-		if (enable_probe(kpc, entry) < 0)
-			free_entry(entry);
-	}
-	mutex_unlock(&kpc->lock);
-}
-
-static void kpc_handle_going_module(struct kprobe_coverage *kpc,
-		struct module *mod)
-{
-	struct list_head *iter;
-	struct list_head *tmp;
-
-	mutex_lock(&kpc->lock);
-	list_for_each_safe(iter, tmp, &kpc->pending_list) {
-		struct kprobe_coverage_entry *entry;
-
-		entry = (struct kprobe_coverage_entry *)container_of(iter,
-				struct kprobe_coverage_entry, lh);
-
-		if (module_name_to_index(kpc, mod->name) != entry->name_index)
-			continue;
-
-		/* Remove pending entries for the current module */
-		unregister_kprobe(&entry->kp);
-		list_del(&entry->lh);
-		free_entry(entry);
-	}
-	mutex_unlock(&kpc->lock);
-}
-
-static int kpc_module_notifier(struct notifier_block *nb,
-		unsigned long event, void *data)
-{
-	struct module *mod = data;
-
-	if (event == MODULE_STATE_COMING)
-		kpc_handle_coming_module(global_kpc, mod);
-	else if (event == MODULE_STATE_GOING)
-		kpc_handle_going_module(global_kpc, mod);
-
-	return 0;
-}
-
-
-static const struct file_operations kpc_control_fops =
-{
-	.owner = THIS_MODULE,
-	.open = kpc_control_open,
-	.write = kpc_control_write
-};
-
-static const struct file_operations kpc_show_fops =
-{
-	.owner = THIS_MODULE,
-	.open = kpc_show_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = seq_release,
-};
-
-
-
-static struct notifier_block kpc_module_notifier_block =
-{
-	.notifier_call = kpc_module_notifier,
-};
-
-static int __init kpc_init(struct kprobe_coverage *kpc)
-{
-	kpc->workqueue = create_singlethread_workqueue("kprobe-coverage");
-
-	if (!kpc->workqueue)
-		return -ENODEV;
-
-	/* Create debugfs entries */
-	kpc->debugfs_root = debugfs_create_dir("kprobe-coverage", NULL);
-	if (!kpc->debugfs_root) {
-		printk(KERN_ERR "kprobe-coverage: creating root dir failed\n");
-		goto out_workqueue;
-	}
-	if (!debugfs_create_file("control", 0200, kpc->debugfs_root, kpc,
-			&kpc_control_fops))
-		goto out_files;
-
-	if (!debugfs_create_file("show", 0400, kpc->debugfs_root, kpc,
-			&kpc_show_fops))
-		goto out_files;
-
-	if (register_module_notifier(&kpc_module_notifier_block) < 0)
-		goto out_files;
-
-	INIT_LIST_HEAD(&kpc->pending_list);
-	INIT_LIST_HEAD(&kpc->hit_list);
-	INIT_LIST_HEAD(&kpc->deferred_list);
-
-	init_waitqueue_head(&kpc->wait_queue);
-	mutex_init(&kpc->lock);
-
-	/* The kernel is always index 0 */
-	kpc->name_count = 1;
-
-	return 0;
-
-out_files:
-	debugfs_remove_recursive(kpc->debugfs_root);
-out_workqueue:
-	destroy_workqueue(kpc->workqueue);
-
-	return -EINVAL;
-}
-
-static int __init kpc_init_module(void)
-{
-	int out;
-
-	global_kpc = kzalloc(sizeof(*global_kpc), GFP_KERNEL);
-	if (!global_kpc)
-		return -ENOMEM;
-
-	out = kpc_init(global_kpc);
-	if (out < 0) {
-		kfree(global_kpc);
-
-		global_kpc = NULL;
-	}
-
-	return out;
-}
-
-static void __exit kpc_exit_module(void)
-{
-	kpc_clear(global_kpc);
-
-	debugfs_remove_recursive(global_kpc->debugfs_root);
-	unregister_module_notifier(&kpc_module_notifier_block);
-	destroy_workqueue(global_kpc->workqueue);
-
-	kfree(global_kpc);
-	global_kpc = NULL;
-}
-
-module_init(kpc_init_module);
-module_exit(kpc_exit_module);
-MODULE_AUTHOR("Simon Kagstrom <simon.kagstrom@gmail.com>");
-MODULE_DESCRIPTION("Code coverage through kprobes and debugfs");
-MODULE_LICENSE("GPL");
diff --git a/kcov-38/src/main-system-daemon.cc b/kcov-38/src/main-system-daemon.cc
deleted file mode 100644
index d1ef7213d592..000000000000
--- a/kcov-38/src/main-system-daemon.cc
+++ /dev/null
@@ -1,472 +0,0 @@
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include <string>
-#include <unordered_map>
-#include <mutex>
-
-#include <system-mode/registration.hh>
-#include <system-mode/file-data.hh>
-#include <engine.hh>
-#include <utils.hh>
-#include <configuration.hh>
-
-#include "engines/system-mode-file-format.hh"
-
-#include <unordered_map>
-
-using namespace kcov;
-
-static std::mutex outputFileMutex;
-static std::unordered_map<uint32_t, kcov_system_mode::system_mode_memory *> outputFiles;
-
-class ProcessHandler : public IEngine::IEventListener
-{
-public:
-	ProcessHandler(const std::string destinationDir, const std::string &filename, pid_t pid,
-			kcov_system_mode::system_mode_memory *output) :
-		m_filename(filename),
-		m_destinationDir(destinationDir),
-		m_pid(pid),
-		m_engine(NULL),
-		m_output(output),
-		m_id(0)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		conf.setKey("attach-pid", m_pid);
-	}
-
-	virtual ~ProcessHandler()
-	{
-	}
-
-	bool attach(const SystemModeFile *sysFile)
-	{
-		IEngineFactory::IEngineCreator &engineCreator = IEngineFactory::getInstance().matchEngine(m_filename);
-
-		m_engine = engineCreator.create();
-		if (!m_engine)
-		{
-			kcov_debug(INFO_MSG, "Can't create engine\n");
-
-			return false;
-		}
-
-		if (!m_engine->start(*this, m_filename))
-		{
-			kcov_debug(INFO_MSG, "Can't start engine for %s:%d\n", m_filename.c_str(), m_pid);
-
-			return false;
-		}
-
-		const std::vector<uint64_t> &entries = sysFile->getEntries();
-		uint32_t index = 0;
-
-		m_id = sysFile->getId();
-
-		for (std::vector<uint64_t>::const_iterator it = entries.begin();
-				it != entries.end();
-				++it, ++index)
-		{
-			m_indexByAddress[*it] = index;
-			m_engine->registerBreakpoint(*it);
-		}
-
-		return true;
-	}
-
-	void run()
-	{
-		if (!m_output)
-		{
-			panic("Output not created in run(), check implementation\n");
-		}
-
-		while (1)
-		{
-			bool rv = continueExecution();
-
-			// Exit!
-			if (!rv)
-			{
-				break;
-			}
-		}
-	}
-
-	bool continueExecution()
-	{
-		return m_engine->continueExecution();
-	}
-
-private:
-	void onEvent(const IEngine::Event &ev)
-	{
-		// The others are not very interesting
-		if (ev.type == ev_breakpoint)
-		{
-			IndexMap_t::iterator it = m_indexByAddress.find(ev.addr);
-
-			if (it != m_indexByAddress.end())
-			{
-				m_output->reportIndex(it->second);
-			}
-		}
-	}
-
-
-	const std::string m_reportFilename;
-	const std::string m_filename;
-	const std::string m_destinationDir;
-
-	pid_t m_pid;
-	IEngine *m_engine;
-
-	typedef std::unordered_map<uint64_t, uint32_t> IndexMap_t;
-	IndexMap_t m_indexByAddress;
-
-	kcov_system_mode::system_mode_memory *m_output;
-	uint32_t m_id;
-};
-
-static SystemModeFile *getSystemModeFileFromFilename(const std::string &m_filename)
-{
-	size_t sz;
-	void *p;
-
-	p = read_file(&sz, "%s", m_filename.c_str());
-	if (!p)
-	{
-		kcov_debug(INFO_MSG, "Can't read %s\n", m_filename.c_str());
-
-		return NULL;
-	}
-
-	SystemModeFile *sysFile = SystemModeFile::fromProcessedFile(p, sz);
-	free(p);
-
-	if (!sysFile)
-	{
-		kcov_debug(INFO_MSG, "Can't unmarshal %s\n", m_filename.c_str());
-
-		return NULL;
-	}
-
-	return sysFile;
-}
-
-static void processOne(const std::string &destinationDir, const std::string &filename, pid_t pid)
-{
-	Semaphore sem(0);
-
-	SystemModeFile *sysFile = getSystemModeFileFromFilename(filename);
-	if (!sysFile)
-	{
-		return;
-	}
-
-	// Create output memory representation (mmap:ed)
-	outputFileMutex.lock();
-	kcov_system_mode::system_mode_memory *output = outputFiles[sysFile->getId()];
-	if (!output)
-	{
-		output = new kcov_system_mode::system_mode_memory(sysFile->getFilename(), sysFile->getOptions(), sysFile->getEntries().size());
-		outputFiles[sysFile->getId()] = output;
-	}
-	outputFileMutex.unlock();
-
-
-	// Create a child and process everything there
-	pid_t child = fork();
-	if (child < 0)
-	{
-		kcov_debug(INFO_MSG, "Can't fork?");
-
-		delete sysFile;
-		return;
-	}
-	else if (child == 0)
-	{
-		// Child
-		ProcessHandler handler(destinationDir, filename, pid, output);
-
-		// Parse and run!
-		bool ok = handler.attach(sysFile);
-		if (ok)
-		{
-			// Awake the process in open() for the readback FIFO
-			handler.continueExecution();
-			sem.notify();
-			handler.run();
-		}
-		else
-		{
-			sem.notify();
-		}
-
-		exit(0);
-	}
-	else
-	{
-		// Parent, wait until attached
-		sem.wait();
-	}
-
-	delete sysFile;
-}
-
-
-// https://stackoverflow.com/questions/1486833/pthread-cond-timedwait-help
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-static void waitCond(unsigned secs)
-{
-    struct timespec timeToWait;
-    struct timeval now;
-
-    gettimeofday(&now,NULL);
-
-    timeToWait.tv_sec = now.tv_sec + secs;
-    timeToWait.tv_nsec = now.tv_usec;
-
-    pthread_mutex_lock(&mutex);
-    pthread_cond_timedwait(&cond, &mutex, &timeToWait);
-    pthread_mutex_unlock(&mutex);
-}
-
-static bool doExit = false;
-static void onExitSignal(int sig)
-{
-	// Forward the signal to the traced program
-	doExit = true;
-	pthread_cond_signal(&cond);
-}
-
-static void *outputThread(void *p)
-{
-	std::string *in = (std::string *)p;
-	std::string destinationDir = *in;
-
-	(void)mkdir(destinationDir.c_str(), 0755);
-
-	while (1)
-	{
-		// Write data every two seconds
-		waitCond(2);
-
-		if (doExit)
-		{
-			break;
-		}
-
-		// Copy to a list to process
-		std::vector<std::pair<uint32_t, kcov_system_mode::system_mode_memory *>> toProcess;
-		outputFileMutex.lock();
-		for (std::unordered_map<uint32_t, kcov_system_mode::system_mode_memory *>::iterator it = outputFiles.begin();
-				it != outputFiles.end();
-				++it)
-		{
-			toProcess.push_back(std::pair<uint32_t, kcov_system_mode::system_mode_memory *>(it->first, it->second));
-		}
-		outputFileMutex.unlock();
-
-		for (std::vector<std::pair<uint32_t, kcov_system_mode::system_mode_memory *>>::iterator it = toProcess.begin();
-				it != toProcess.end();
-				++it)
-		{
-			kcov_system_mode::system_mode_memory *cur = it->second;
-
-			// Not changed, don't write
-			if (!cur->isDirty())
-			{
-				continue;
-			}
-			// Mark as clean and write the data
-			cur->markClean();
-
-
-			size_t size;
-			struct kcov_system_mode::system_mode_file *dst = kcov_system_mode::memoryToFile(*cur, size);
-
-			if (!dst)
-			{
-				error("system-mode-daemon: Can't marshal data\n");
-				continue;
-			}
-
-			std::string out = fmt("%s/%08lx", destinationDir.c_str(), (long)it->first);
-			FILE *fp = fopen(out.c_str(), "w");
-
-			if (fp)
-			{
-				fwrite(dst, 1, size, fp);
-				fclose(fp);
-			}
-			else
-			{
-				fprintf(stderr, "kcov-binary-lib: Can't write outfile\n");
-			}
-
-			free(dst);
-		}
-	}
-
-	return NULL;
-}
-
-// https://stackoverflow.com/questions/17954432/creating-a-daemon-in-linux/17955149#17955149
-static void daemonize(void)
-{
-	pid_t child;
-
-	child = fork();
-
-	if (child < 0)
-	{
-		panic("Fork failed?\n");
-	}
-	else if (child > 0)
-	{
-		// Parent
-		exit(0);
-	}
-	if (setsid() < 0)
-	{
-		exit(1);
-	}
-
-	// Ignore signals
-	signal(SIGCHLD, SIG_IGN);
-    signal(SIGHUP, SIG_IGN);
-
-	child = fork();
-
-	if (child < 0)
-	{
-		panic("Fork failed?\n");
-	}
-	else if (child > 0)
-	{
-		// Parent
-		exit(0);
-	}
-
-	close(fileno(stdin));
-	close(fileno(stderr));
-	close(fileno(stdout));
-}
-
-
-int main(int argc, const char *argv[])
-{
-	std::string pidFile = "/tmp/kcov-system.pid";
-
-	if (file_exists(pidFile))
-	{
-		fprintf(stderr, "%s already exists, indicating an already running daemon\n"
-				"Remove the file if this is incorrect\n", pidFile.c_str());
-		exit(1);
-	}
-
-	const char *path = getenv("KCOV_SYSTEM_DESTINATION_DIR");
-	if (argc == 2 && strcmp(argv[1], "-d") == 0)
-	{
-		daemonize();
-	}
-
-	// Create PID-file
-	char pid[256];
-	snprintf(pid, sizeof(pid), "%d", getpid());
-	write_file(pid, strlen(pid) + 1, "%s", pidFile.c_str());
-
-	std::string destinationDir = "/tmp/kcov-data";
-
-	if (path)
-		destinationDir = path;
-
-	(void)::mkdir(destinationDir.c_str(), 0755);
-
-	const char *pipePath = "/tmp/kcov-system.pipe";
-	(void)::mkfifo(pipePath, 0644);
-
-	int fd = ::open(pipePath, O_RDONLY);
-	if (fd < 0)
-	{
-		fprintf(stderr, "Can't open fifo %s\n", pipePath);
-		unlink(pidFile.c_str());
-		exit(1);
-	}
-
-	// Catch Cltr-C and kill
-	signal(SIGINT, onExitSignal);
-	signal(SIGTERM, onExitSignal);
-
-	pthread_t thread;
-	pthread_create(&thread, NULL, outputThread, (void *)&destinationDir);
-
-	while (1)
-	{
-		char buf[4096];
-
-		if (doExit)
-		{
-			break;
-		}
-
-		memset(buf, 0, sizeof(buf));
-		int r = ::read(fd, buf, sizeof(buf));
-
-		if (r <= 0)
-		{
-			continue;
-		}
-
-		// Handle stopping requests
-		std::string stopCommand = "STOPME";
-		if (r >= (int)stopCommand.size() &&
-				strncmp(stopCommand.c_str(), buf, stopCommand.size()) == 0)
-		{
-			doExit = 1;
-			continue;
-		}
-
-		if (r < (int)sizeof(struct new_process_entry))
-		{
-			continue;
-		}
-
-		uint16_t pid;
-		std::string entryFilename;
-
-		struct new_process_entry *p = (struct new_process_entry *)buf;
-
-		if (!parseProcessEntry(p, pid, entryFilename))
-		{
-			continue;
-		}
-
-		processOne(destinationDir, entryFilename, pid);
-
-		// Write a character to let the process loose again
-		write_file(buf, 1, "%s/%d", destinationDir.c_str(), pid);
-	}
-	pthread_cond_signal(&cond);
-
-	// Wait for the reporter thread
-	void *rv;
-	pthread_join(thread, &rv);
-
-	close(fd);
-	unlink(pipePath);
-	unlink(pidFile.c_str());
-}
diff --git a/kcov-38/src/main.cc b/kcov-38/src/main.cc
deleted file mode 100644
index f81db9c11076..000000000000
--- a/kcov-38/src/main.cc
+++ /dev/null
@@ -1,579 +0,0 @@
-#include <configuration.hh>
-#include <engine.hh>
-#include <reporter.hh>
-#include <writer.hh>
-#include <collector.hh>
-#include <filter.hh>
-#include <output-handler.hh>
-#include <file-parser.hh>
-#include <solib-handler.hh>
-#include <generated-data-base.hh>
-#include <utils.hh>
-
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <dirent.h>
-#include <unistd.h>
-
-#include "merge-parser.hh"
-#include "engines/system-mode-file-format.hh"
-#include "writers/html-writer.hh"
-#include "writers/json-writer.hh"
-#include "writers/coveralls-writer.hh"
-#include "writers/cobertura-writer.hh"
-#include "writers/sonarqube-xml-writer.hh"
-
-using namespace kcov;
-
-extern GeneratedData kcov_system_library_data;
-
-static IEngine *g_engine;
-static IOutputHandler *g_output;
-static ICollector *g_collector;
-static IReporter *g_reporter;
-static ISolibHandler *g_solibHandler;
-static IFilter *g_filter;
-static IFilter *g_basicFilter;
-
-static void do_cleanup()
-{
-	delete g_collector;
-	delete g_output;
-	delete g_reporter;
-	delete g_solibHandler; // Before the engine since a SIGTERM is sent to the thread
-	delete g_engine;
-	delete g_filter;
-	delete g_basicFilter;
-}
-
-static void ctrlc(int sig)
-{
-	// Forward the signal to the traced program
-	g_engine->kill(sig);
-}
-
-static void daemonize(void)
-{
-	pid_t child;
-	int res;
-
-	IConfiguration &conf = IConfiguration::getInstance();
-	std::string fifoName = conf.keyAsString("target-directory") + "/done.fifo";
-
-	unlink(fifoName.c_str());
-	res = mkfifo(fifoName.c_str(), 0600);
-
-	panic_if(res < 0, "Can't create FIFO");
-
-	child = fork();
-
-	if (child < 0)
-	{
-		panic("Fork failed?\n");
-	}
-	else if (child == 0)
-	{
-		child = fork();
-
-		if (child < 0)
-		{
-			panic("Fork failed?\n");
-		}
-		else if (child > 0)
-		{
-			// Second parent
-			exit(0);
-		}
-	}
-	else
-	{
-		// Parent
-		FILE *fp;
-		char buf[255];
-		char *endp;
-		char *p;
-		unsigned long out;
-
-		fp = fopen(fifoName.c_str(), "r");
-		panic_if(!fp, "Can't open FIFO");
-		p = fgets(buf, sizeof(buf), fp);
-		panic_if(!p, "Can't read FIFO");
-
-		out = strtoul(p, &endp, 10);
-		if (p == endp)
-			out = 0;
-
-		exit(out);
-	}
-}
-
-// Return the number of metadata directories in the kcov output path
-unsigned int countMetadata()
-{
-	IConfiguration &conf = IConfiguration::getInstance();
-	std::string base = conf.keyAsString("out-directory");
-	DIR *dir;
-	struct dirent *de;
-
-	dir = ::opendir(base.c_str());
-	if (!dir)
-		return 0;
-
-	unsigned int out = 0;
-
-	// Count metadata directories
-	for (de = ::readdir(dir); de; de = ::readdir(dir))
-	{
-		std::string name = de->d_name;
-		std::string cur = base + name + "/metadata";
-		std::string binaryName = conf.keyAsString("binary-name");
-
-		// ... except for the current coveree and coveree.CHECKSUM
-		if (binaryName == name
-				|| (name.size() > binaryName.size()
-						&& name.find(binaryName) == 0
-						&& name[binaryName.size()] == '.'))
-			continue;
-
-		DIR *metadataDir;
-		struct dirent *de2;
-
-		metadataDir = ::opendir(cur.c_str());
-		if (!metadataDir)
-			continue;
-
-		// Count metadata files
-		unsigned int datum = 0;
-		for (de2 = ::readdir(metadataDir); de2; de2 = ::readdir(metadataDir))
-		{
-			if (de2->d_name[0] == '.')
-				continue;
-
-			datum++;
-		}
-		out += !!datum;
-		::closedir(metadataDir);
-	}
-	::closedir(dir);
-
-	return out;
-}
-
-/*
- * Run in merge-mode, i.e., run kcov on previously generated coverage runs and
- * create a common merged output from them.
- */
-static int runMergeMode()
-{
-	IFilter &filter = IFilter::create();
-	IReporter &reporter = IReporter::createDummyReporter();
-	IOutputHandler &output = IOutputHandler::create(reporter, NULL);
-	IConfiguration &conf = IConfiguration::getInstance();
-
-	const std::string &base = output.getBaseDirectory();
-	const std::string &out = output.getOutDirectory();
-
-	IMergeParser &mergeParser = createMergeParser(reporter, base, out, filter);
-	IReporter &mergeReporter = IReporter::create(mergeParser, mergeParser,
-			filter);
-	IWriter &mergeHtmlWriter = createHtmlWriter(mergeParser, mergeReporter,
-			base, base + "/kcov-merged", conf.keyAsString("merged-name"), true);
-	IWriter &mergeJsonWriter = createJsonWriter(mergeParser, mergeReporter,
-			base + "kcov-merged/coverage.json");
-	IWriter &mergeCoberturaWriter = createCoberturaWriter(mergeParser,
-			mergeReporter, base + "kcov-merged");
-	IWriter &mergeSonarqubeWriter = createSonarqubeWriter(mergeParser,
-			mergeReporter, base + "kcov-merged/sonarqube.xml");
-	IWriter &mergeCoverallsWriter = createCoverallsWriter(mergeParser,
-			mergeReporter);
-	(void) mkdir(fmt("%s/kcov-merged", base.c_str()).c_str(), 0755);
-
-	output.registerWriter(mergeParser);
-	output.registerWriter(mergeHtmlWriter);
-	output.registerWriter(mergeJsonWriter);
-	output.registerWriter(mergeCoberturaWriter);
-	output.registerWriter(mergeSonarqubeWriter);
-	output.registerWriter(mergeCoverallsWriter);
-
-	output.start();
-	output.stop();
-
-	mergeReporter.writeCoverageDatabase();
-	delete &output;
-
-	return 0;
-}
-
-static int runKcov(IConfiguration::RunMode_t runningMode)
-{
-	IConfiguration &conf = IConfiguration::getInstance();
-
-	std::string file = conf.keyAsString("binary-path")
-			+ conf.keyAsString("binary-name");
-	IFileParser *parser = IParserManager::getInstance().matchParser(file);
-	if (!parser)
-	{
-		error("Can't find or open %s\n", file.c_str());
-		return 1;
-	}
-
-	// Match and create an engine
-	IEngineFactory::IEngineCreator &engineCreator =
-			IEngineFactory::getInstance().matchEngine(file);
-	IEngine *engine = engineCreator.create();
-	if (!engine)
-	{
-		conf.printUsage();
-		return 1;
-	}
-
-	IFilter &filter = IFilter::create();
-	IFilter &basicFilter = IFilter::createBasic();
-
-	ICollector &collector = ICollector::create(*parser, *engine, filter);
-	IReporter &reporter = IReporter::create(*parser, collector, filter);
-	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
-	ISolibHandler &solibHandler = createSolibHandler(*parser, collector);
-
-	parser->addFile(file);
-
-	// Register writers
-	if (runningMode != IConfiguration::MODE_COLLECT_ONLY)
-	{
-		const std::string &base = output.getBaseDirectory();
-		const std::string &out = output.getOutDirectory();
-
-		IWriter &htmlWriter = createHtmlWriter(*parser, reporter, base, out,
-				conf.keyAsString("binary-name"));
-		IWriter &jsonWriter = createJsonWriter(*parser, reporter,
-				out + "/coverage.json");
-		IWriter &coberturaWriter = createCoberturaWriter(*parser, reporter,
-				out);
-		IWriter &sonarqubeWriter = createSonarqubeWriter(*parser, reporter,
-				out + "/sonarqube.xml");
-
-		// The merge parser is both a parser, a writer and a collector (!)
-		IMergeParser &mergeParser = createMergeParser(reporter, base, out,
-				filter);
-		IReporter &mergeReporter = IReporter::create(mergeParser, mergeParser,
-				basicFilter);
-		IWriter &mergeHtmlWriter = createHtmlWriter(mergeParser, mergeReporter,
-				base, base + "/kcov-merged", conf.keyAsString("merged-name"),
-				false);
-		IWriter &mergeJsonWriter = createJsonWriter(mergeParser, mergeReporter,
-				base + "kcov-merged/coverage.json");
-		IWriter &mergeCoberturaWriter = createCoberturaWriter(mergeParser,
-				mergeReporter, base + "kcov-merged");
-		IWriter &mergeSonarqubeWriter = createSonarqubeWriter(mergeParser,
-				mergeReporter, base + "kcov-merged/sonarqube.xml");
-		(void) mkdir(fmt("%s/kcov-merged", base.c_str()).c_str(), 0755);
-
-		reporter.registerListener(mergeParser);
-
-		output.registerWriter(mergeParser);
-
-		// Multiple binaries? Register the merged mode stuff
-		if (countMetadata() > 0)
-		{
-			output.registerWriter(mergeHtmlWriter);
-			output.registerWriter(mergeJsonWriter);
-			output.registerWriter(mergeCoberturaWriter);
-			output.registerWriter(mergeSonarqubeWriter);
-			output.registerWriter(
-					createCoverallsWriter(mergeParser, mergeReporter));
-		}
-		else
-		{
-			output.registerWriter(createCoverallsWriter(*parser, reporter));
-		}
-
-		output.registerWriter(htmlWriter);
-		output.registerWriter(jsonWriter);
-		output.registerWriter(coberturaWriter);
-		output.registerWriter(sonarqubeWriter);
-	}
-
-	g_engine = engine;
-	g_output = &output;
-	g_reporter = &reporter;
-	g_collector = &collector;
-	g_solibHandler = &solibHandler;
-	g_filter = &filter;
-	g_basicFilter = &basicFilter;
-	signal(SIGINT, ctrlc);
-	signal(SIGTERM, ctrlc);
-
-	if (conf.keyAsInt("daemonize-on-first-process-exit"))
-		daemonize();
-
-	parser->setupParser(&filter);
-	output.start();
-	solibHandler.startup();
-
-	int ret = 0;
-
-	if (runningMode != IConfiguration::MODE_REPORT_ONLY)
-	{
-		ret = collector.run(file);
-	}
-	else
-	{
-		parser->parse();
-	}
-
-	do_cleanup();
-
-	return ret;
-}
-
-static int runSystemModeRecordFile(const std::string &dir,
-		const std::string &file, mode_t dirMode, mode_t mode)
-{
-	pid_t child = fork();
-	if (child < 0)
-	{
-		panic("Fork failed?\n");
-	}
-	else if (child == 0)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		std::string rootDir = conf.keyAsString("binary-path")
-				+ conf.keyAsString("binary-name");
-
-		if (dir.size() < rootDir.size())
-		{
-			error("kcov: Something strange with the directories: %s vs %s\n",
-					dir.c_str(), rootDir.c_str());
-			return -1;
-		}
-
-		std::string dstDir = dir_concat(conf.keyAsString("out-directory"),
-				dir.substr(rootDir.size()));
-		std::string dstFile = dir_concat(conf.keyAsString("out-directory"),
-				file.substr(rootDir.size()));
-
-		conf.setKey("system-mode-write-file", dstFile);
-		conf.setKey("system-mode-write-file-mode", mode & 07777);
-		conf.setKey("binary-name", file);
-		conf.setKey("binary-path", ""); // file uses an absolute path
-
-		(void) mkdir(dstDir.c_str(), dirMode & 07777);
-
-		runKcov(IConfiguration::MODE_COLLECT_ONLY);
-		exit(0);
-	}
-	else
-	{
-		// Parent
-		int status;
-
-		::waitpid(child, &status, 0);
-	}
-
-	return 0;
-}
-
-static int runSystemModeRecordDirectory(const std::string &base, mode_t mode)
-{
-	DIR *dir = ::opendir(base.c_str());
-	if (!dir)
-	{
-		error("Can't open directory %s\n", base.c_str());
-		return -1;
-	}
-
-	// Loop through the directory structure
-	struct dirent *de;
-	for (de = ::readdir(dir); de; de = ::readdir(dir))
-	{
-		std::string cur = base + "/" + de->d_name;
-
-		if (strcmp(de->d_name, ".") == 0)
-			continue;
-
-		if (strcmp(de->d_name, "..") == 0)
-			continue;
-
-		struct stat st;
-
-		if (lstat(cur.c_str(), &st) < 0)
-			continue;
-
-		if (S_ISDIR(st.st_mode))
-		{
-			runSystemModeRecordDirectory(cur, st.st_mode);
-		}
-		else if (S_ISREG(st.st_mode)
-				&& (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-		{
-			// Executable file?
-			runSystemModeRecordFile(base, cur, mode, st.st_mode);
-		}
-	}
-	::closedir(dir);
-
-	return 0;
-}
-
-static int runSystemModeRecord()
-{
-	IConfiguration &conf = IConfiguration::getInstance();
-
-	std::string base = conf.keyAsString("binary-path")
-			+ conf.keyAsString("binary-name");
-	std::string out = conf.keyAsString("out-directory");
-	std::string lib = out + "/lib";
-
-	umask(~0777);
-	(void) mkdir(out.c_str(), 0755);
-	(void) mkdir(lib.c_str(), 0755);
-
-	std::string library = fmt("%s/libkcov_system.so", lib.c_str());
-
-	if (write_file(kcov_system_library_data.data(),
-			kcov_system_library_data.size(), "%s", library.c_str()) < 0)
-	{
-		error("Can't write binary library at %s", library.c_str());
-
-		return -1;
-	}
-	if (chmod(library.c_str(), 0755) < 0)
-	{
-		error("Can't chmod??\n");
-	}
-
-	return runSystemModeRecordDirectory(base, 0755);
-}
-
-std::vector<std::string> optionsStringToConfigurationVector(
-		const std::string &in)
-{
-	std::vector<std::string> parts = split_string(in, " ");
-	if (parts.size() != 6)
-	{
-		warning("Options vector is not correct: '%s' splits into %zu\n",
-				in.c_str(), parts.size());
-		return std::vector<std::string>();
-	}
-
-	return parts;
-}
-
-static int runSystemModeReportFile(const std::string &file)
-{
-	kcov_system_mode::system_mode_memory *data = kcov_system_mode::diskToMemory(
-			file);
-
-	if (!data)
-	{
-		return -1;
-	}
-
-	pid_t child = fork();
-	if (child < 0)
-	{
-		panic("Fork failed?\n");
-	}
-	else if (child == 0)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		std::pair<std::string, std::string> both = split_path(data->filename); // absolute path
-
-		conf.setKey("system-mode-read-results-file", file);
-		conf.setKey("binary-name", both.second);
-		conf.setKey("binary-path", both.first);
-		conf.setKey("target-directory",
-				conf.keyAsString("out-directory") + "/" + both.second);
-
-		std::vector<std::string> options = optionsStringToConfigurationVector(
-				data->options);
-		if (options.size() == 6)
-		{
-			conf.setKey("include-pattern", options[0]);
-			conf.setKey("exclude-pattern", options[1]);
-			conf.setKey("include-path", options[2]);
-			conf.setKey("exclude-path", options[3]);
-			conf.setKey("exclude-line", options[4]);
-			conf.setKey("exclude-region", options[5]);
-		}
-
-		runKcov(IConfiguration::MODE_COLLECT_AND_REPORT);
-		exit(0);
-	}
-	else
-	{
-		// Parent
-		int status;
-
-		::waitpid(child, &status, 0);
-	}
-
-	delete data;
-
-	return 0;
-}
-
-static int runSystemModeReportDirectory(const std::string &base)
-{
-	DIR *dir = ::opendir(base.c_str());
-	if (!dir)
-	{
-		error("Can't open directory %s\n", base.c_str());
-		return -1;
-	}
-
-	// Loop through the directory structure
-	struct dirent *de;
-	for (de = ::readdir(dir); de; de = ::readdir(dir))
-	{
-		std::string cur = base + "/" + de->d_name;
-		struct stat st;
-
-		if (lstat(cur.c_str(), &st) < 0)
-			continue;
-
-		// Executable file?
-		if (S_ISREG(st.st_mode))
-		{
-			runSystemModeReportFile(cur);
-		}
-	}
-	::closedir(dir);
-
-	return 0;
-}
-
-static int runSystemModeReport()
-{
-	IConfiguration &conf = IConfiguration::getInstance();
-
-	std::string base = conf.keyAsString("binary-path")
-			+ conf.keyAsString("binary-name");
-
-	return runSystemModeReportDirectory(base);
-}
-
-int main(int argc, const char *argv[])
-{
-	IConfiguration &conf = IConfiguration::getInstance();
-
-	if (!conf.parse(argc, argv))
-		return 1;
-
-	IConfiguration::RunMode_t runningMode =
-			(IConfiguration::RunMode_t) conf.keyAsInt("running-mode");
-
-	if (runningMode == IConfiguration::MODE_MERGE_ONLY)
-		return runMergeMode();
-
-	if (runningMode == IConfiguration::MODE_SYSTEM_RECORD)
-		return runSystemModeRecord();
-
-	if (runningMode == IConfiguration::MODE_SYSTEM_REPORT)
-		return runSystemModeReport();
-
-	return runKcov(runningMode);
-}
diff --git a/kcov-38/src/merge-file-parser.cc b/kcov-38/src/merge-file-parser.cc
deleted file mode 100644
index f91d39c8bae6..000000000000
--- a/kcov-38/src/merge-file-parser.cc
+++ /dev/null
@@ -1,616 +0,0 @@
-#include <file-parser.hh>
-#include <collector.hh>
-#include <utils.hh>
-#include <filter.hh>
-#include <writer.hh>
-#include <configuration.hh>
-
-#include <vector>
-#include <string>
-#include <list>
-#include <unordered_map>
-#include <map>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <swap-endian.hh>
-
-#include "merge-parser.hh"
-
-using namespace kcov;
-
-#define MERGE_MAGIC   0x4d6f6172 // "Moar"
-#define MERGE_VERSION 4
-
-struct line_entry
-{
-	uint32_t line;
-	uint32_t address_start;
-	uint32_t n_addresses;
-};
-
-struct file_data
-{
-	uint32_t magic;
-	uint32_t version;
-	uint32_t size;
-	uint32_t checksum;
-	uint64_t timestamp;
-	uint32_t n_entries;
-	uint32_t address_table_offset;
-	uint32_t file_name_offset;
-
-	struct line_entry entries[];
-};
-
-// Unit test stuff
-namespace merge_parser
-{
-class marshal;
-class output;
-class input;
-}
-
-class MergeParser: public IMergeParser
-{
-public:
-	friend class merge_parser::marshal;
-	friend class merge_parser::output;
-	friend class merge_parser::input;
-
-	MergeParser(IReporter &reporter, const std::string &baseDirectory, const std::string &outputDirectory, IFilter &filter) :
-			m_baseDirectory(baseDirectory), m_outputDirectory(outputDirectory), m_filter(filter)
-	{
-		reporter.registerListener(*this);
-	}
-
-	~MergeParser()
-	{
-		for (FileByNameMap_t::iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *cur = it->second;
-
-			delete cur;
-		}
-
-		m_files.clear();
-	}
-
-	// From IFileParser
-	virtual bool addFile(const std::string &filename, struct phdr_data_entry *phdr_data)
-	{
-		return true;
-	}
-
-	virtual bool setMainFileRelocation(unsigned long relocation)
-	{
-		return true;
-	}
-
-	virtual void registerLineListener(IFileParser::ILineListener &listener)
-	{
-		m_lineListeners.push_back(&listener);
-	}
-
-	// Unused ...
-	virtual void registerFileListener(IFileParser::IFileListener &listener)
-	{
-	}
-
-	virtual bool parse()
-	{
-		return true;
-	}
-
-	virtual uint64_t getChecksum()
-	{
-		return 0;
-	}
-
-	std::string getParserType()
-	{
-		return "merge";
-	}
-
-	enum IFileParser::PossibleHits maxPossibleHits()
-	{
-		return IFileParser::HITS_SINGLE; // Hits from multiple binaries
-	}
-
-	void setupParser(IFilter *filter)
-	{
-	}
-
-	// ... to here
-	virtual unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		return match_none;
-	}
-
-	// From IReporter::IListener
-	void onAddress(uint64_t addr, unsigned long hits)
-	{
-		if (m_fileLineByAddress.find(addr) == m_fileLineByAddress.end())
-		{
-			m_pendingHits[addr] = hits;
-			return;
-		}
-
-		addr = m_fileLineByAddress[addr];
-
-		File *file = m_filesByAddress[addr];
-
-		if (!file)
-			return;
-
-		file->registerHits(addr, hits);
-
-		for (CollectorListenerList_t::const_iterator it = m_collectorListeners.begin(); it != m_collectorListeners.end();
-				++it)
-			(*it)->onAddressHit(addr, hits);
-	}
-
-	// From IReporter::IListener
-	virtual void onLineReporter(const std::string &filename, unsigned int lineNr, uint64_t addr)
-	{
-		if (!m_filter.runFilters(filename))
-		{
-			return;
-		}
-
-		// Nothing to do in that case
-		if (!file_exists(filename))
-			return;
-
-		File *file;
-
-		file = m_files[filename];
-		if (!file)
-		{
-			file = new File(filename);
-
-			m_files[filename] = file;
-		}
-
-		uint64_t addrHash = hashAddress(filename, lineNr, addr) & ~(1ULL << 63);
-
-		m_fileLineByAddress[addr] = addrHash;
-
-		// Mark as a local file
-		file->setLocal();
-		file->addLine(lineNr, addrHash);
-
-		// Record this for the collector hits
-		m_filesByAddress[addrHash] = file;
-
-		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
-			(*it)->onLine(filename, lineNr, addrHash);
-
-		/*
-		 * Visit pending addresses for this file/line. onAddress gets a non-
-		 * hashed address, so replicate that behavior here.
-		 */
-		AddrToHitsMap_t::iterator pend = m_pendingHits.find(addr);
-		if (pend != m_pendingHits.end())
-		{
-			onAddress(addr, pend->second);
-
-			m_pendingHits.erase(addr);
-		}
-	}
-
-	// From IWriter
-	void onStartup()
-	{
-		(void) mkdir(m_baseDirectory.c_str(), 0755);
-		(void) mkdir(m_outputDirectory.c_str(), 0755);
-		(void) mkdir(fmt("%s/metadata", m_outputDirectory.c_str()).c_str(), 0755);
-	}
-
-	void onStop()
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		bool inMergeMode = conf.keyAsInt("running-mode") == IConfiguration::MODE_MERGE_ONLY;
-
-		// Parse data from earlier runs
-		if (inMergeMode)
-			parseStoredDataMerged();
-		else
-			parseStoredData();
-
-		/* Produce something like
-		 *
-		 *   /tmp/kcov/calc/metadata/4f332bca
-		 *   /tmp/kcov/calc/metadata/cd9932a1
-		 *
-		 * For all the files we've covered. The output filename comes from a hash of
-		 * the input filename.
-		 */
-		for (FileByNameMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			/*
-			 *  Only marshal local files, except when in merged mode - then all files
-			 *  are local (or none, depending on how you see it).
-			 */
-			if (!inMergeMode && !it->second->m_local)
-				continue;
-
-			const struct file_data *fd = marshalFile(it->second->m_filename);
-
-			if (!fd)
-				continue;
-
-			uint32_t crc = hash_block((const void *) it->second->m_filename.c_str(), it->second->m_filename.size());
-			std::string name = fmt("%08x", crc);
-
-			write_file((const void *) fd, be_to_host<uint32_t>(fd->size), "%s/metadata/%s", m_outputDirectory.c_str(),
-					name.c_str());
-
-			free((void *) fd);
-		}
-	}
-
-	void write()
-	{
-	}
-
-	// From ICollector
-	virtual void registerListener(ICollector::IListener &listener)
-	{
-		m_collectorListeners.push_back(&listener);
-	}
-
-	virtual void registerEventTickListener(ICollector::IEventTickListener &listener)
-	{
-	}
-
-	virtual int run(const std::string &filename)
-	{
-		// Not used
-		panic("Should not call run here");
-
-		return 0;
-	}
-
-private:
-	uint64_t hashAddress(const std::string &filename, unsigned int lineNr, uint64_t addr)
-	{
-		// Convert address into a suitable format for the merge parser
-		uint64_t addrHash = (uint64_t) hash_block(filename.c_str(), filename.size()) | ((uint64_t) lineNr << 32ULL);
-
-		return addrHash;
-	}
-
-	void parseStoredData()
-	{
-		DIR *dir;
-		struct dirent *de;
-
-		dir = opendir(m_baseDirectory.c_str());
-		panic_if(!dir, "Can't open directory %s\n", m_baseDirectory.c_str());
-
-		// Unmarshal and parse all metadata
-		for (de = readdir(dir); de; de = readdir(dir))
-		{
-			std::string cur = m_baseDirectory + de->d_name;
-
-			// ... except for the current coveree
-			if (cur == m_outputDirectory)
-				continue;
-
-			parseDirectory(cur);
-		}
-		closedir(dir);
-	}
-
-	void parseStoredDataMerged()
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		const char **argv = conf.getArgv();
-		unsigned int argc = conf.getArgc();
-
-		// argv[] contains the directories to merge
-		for (unsigned int i = 0; i < argc; i++)
-		{
-			DIR *dir;
-			struct dirent *de;
-
-			dir = opendir(argv[i]);
-
-			if (!dir)
-			{
-				warning("kcov: Can't open directory %s\n", argv[i]);
-				continue;
-			}
-
-			// Unmarshal and parse all metadata
-			for (de = readdir(dir); de; de = readdir(dir))
-			{
-				std::string cur = fmt("%s/%s", argv[i], de->d_name);
-
-				parseDirectory(cur);
-			}
-			closedir(dir);
-		}
-	}
-
-	void parseDirectory(const std::string &dirName)
-	{
-		DIR *dir;
-		struct dirent *de;
-		std::string metadataDirName = dirName + "/metadata";
-
-		dir = opendir(metadataDirName.c_str());
-		// Can occur naturally
-		if (!dir)
-			return;
-
-		// Read all metadata from the directory
-		for (de = readdir(dir); de; de = readdir(dir))
-			parseOne(metadataDirName, de->d_name);
-
-		closedir(dir);
-	}
-
-	void parseOne(const std::string &metadataDirName, const std::string &curFile)
-	{
-		size_t size;
-
-		// Not as hash?
-		if (!string_is_integer(curFile, 16))
-			return;
-
-		struct file_data *fd = (struct file_data *)read_file(&size, "%s/%s", metadataDirName.c_str(), curFile.c_str());
-		if (!fd)
-			return;
-
-		if (size >= sizeof(struct file_data) && unMarshalFile(fd))
-		{
-			parseFileData(fd);
-		}
-
-		free(fd);
-	}
-
-	void parseFileData(struct file_data *fd)
-	{
-		std::string filename((const char *) fd + fd->file_name_offset);
-
-		filename = m_filter.mangleSourcePath(filename);
-
-		// File has been removed since last test
-		if (!file_exists(filename))
-			return;
-
-		File *file;
-
-		file = m_files[filename];
-		if (!file)
-		{
-			file = new File(filename);
-
-			m_files[filename] = file;
-		}
-		else
-		{
-			// Checksum doesn't match, ignore this file
-			if (file->m_checksum != fd->checksum)
-				return;
-		}
-
-		uint64_t *addrTable = (uint64_t *) ((char *) fd + fd->address_table_offset);
-		for (unsigned i = 0; i < fd->n_entries; i++)
-		{
-			uint32_t lineNr = fd->entries[i].line;
-
-			for (unsigned ia = 0; ia < fd->entries[i].n_addresses; ia++)
-			{
-				uint64_t addr = addrTable[fd->entries[i].address_start + ia];
-
-				// Check if this was a hit (and remove the hit bit from the address)
-				bool hit = (addr & (1ULL << 63));
-				addr &= ~(1ULL << 63);
-
-				file->addLine(lineNr, addr);
-
-				for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
-					(*it)->onLine(filename, lineNr, addr & ~(1ULL << 63));
-
-				// Register and report the hit
-				if (hit)
-				{
-					file->registerHits(addr, 1);
-
-					for (CollectorListenerList_t::const_iterator itC = m_collectorListeners.begin();
-							itC != m_collectorListeners.end(); ++itC)
-						(*itC)->onAddressHit(addr, 1);
-				}
-			}
-		}
-	}
-
-	const struct file_data *marshalFile(const std::string &filename)
-	{
-		File *file = m_files[filename];
-
-		if (!file)
-			return NULL;
-
-		uint32_t n_addrs = 0;
-		for (LineAddrMap_t::const_iterator it = file->m_lines.begin(); it != file->m_lines.end(); ++it)
-		{
-			n_addrs += it->second.size();
-		}
-
-		// Header + each line + the filename
-		size_t size = sizeof(struct file_data) + file->m_lines.size() * sizeof(struct line_entry)
-				+ n_addrs * sizeof(uint64_t) + file->m_filename.size() + 1 + 8; // allow padding of the address table
-		struct file_data *out = (struct file_data *) xmalloc(size);
-
-		out->magic = to_be<uint32_t>(MERGE_MAGIC);
-		out->version = to_be<uint32_t>(MERGE_VERSION);
-		out->checksum = to_be<uint32_t>(file->m_checksum);
-		out->timestamp = to_be<uint64_t>(file->m_fileTimestamp);
-		out->size = to_be<uint32_t>(size);
-		out->n_entries = to_be<uint32_t>(file->m_lines.size());
-
-		struct line_entry *p = out->entries;
-
-		// Point to address table
-		uint64_t *addrTable = (uint64_t *) ((char *) p + sizeof(struct line_entry) * file->m_lines.size());
-		unsigned long addrTable_8 = (unsigned long) addrTable;
-		uint32_t tableOffset = 0;
-
-		// 64-bit align address table
-		if ((addrTable_8 & 7) != 0)
-		{
-			addrTable_8 += 8 - (addrTable_8 & 7);
-
-			addrTable = (uint64_t *) addrTable_8;
-		}
-
-		for (LineAddrMap_t::const_iterator it = file->m_lines.begin(); it != file->m_lines.end(); ++it)
-		{
-			uint32_t line = it->first;
-			p->line = to_be<uint32_t>(line);
-
-			p->address_start = to_be<uint32_t>(tableOffset);
-			p->n_addresses = to_be<uint32_t>(it->second.size());
-			for (AddrMap_t::const_iterator itAddr = it->second.begin(); itAddr != it->second.end(); ++itAddr)
-			{
-				uint64_t addr = itAddr->first;
-
-				if (file->m_addrHits[addr])
-					addr |= (1ULL << 63);
-
-				addrTable[tableOffset] = to_be<uint64_t>(addr);
-
-				tableOffset++;
-			}
-
-			p++;
-		}
-
-		uint32_t tableStart = (uint32_t) ((char *) addrTable - (char *) out);
-		out->address_table_offset = to_be<uint32_t>(tableStart);
-		char *p_name = (char *) out + tableStart + tableOffset * sizeof(uint64_t);
-
-		// Allocated with the terminator above
-		strcpy(p_name, file->m_filename.c_str());
-		out->file_name_offset = to_be<uint32_t>(p_name - (char *) out);
-
-		return out;
-	}
-
-	bool unMarshalFile(struct file_data *fd)
-	{
-		fd->magic = be_to_host<uint32_t>(fd->magic);
-		fd->version = be_to_host<uint32_t>(fd->version);
-		fd->checksum = be_to_host<uint32_t>(fd->checksum);
-		fd->timestamp = be_to_host<uint64_t>(fd->timestamp);
-		fd->size = be_to_host<uint32_t>(fd->size);
-		fd->n_entries = be_to_host<uint32_t>(fd->n_entries);
-		fd->file_name_offset = be_to_host<uint32_t>(fd->file_name_offset);
-		fd->address_table_offset = be_to_host<uint32_t>(fd->address_table_offset);
-
-		if (fd->magic != MERGE_MAGIC)
-			return false;
-
-		if (fd->version != MERGE_VERSION)
-			return false;
-
-		struct line_entry *p = fd->entries;
-
-		// Unmarshal entries...
-		for (unsigned i = 0; i < fd->n_entries; i++)
-		{
-			p->line = be_to_host<uint32_t>(p->line);
-			p->n_addresses = be_to_host<uint32_t>(p->n_addresses);
-			p->address_start = be_to_host<uint32_t>(p->address_start);
-
-			p++;
-		}
-
-		// ... and the address table
-		uint64_t *addressTable = (uint64_t *) ((char *) fd + fd->address_table_offset);
-		for (unsigned i = 0; i < (fd->file_name_offset - fd->address_table_offset) / sizeof(uint64_t); i++)
-			addressTable[i] = be_to_host<uint64_t>(addressTable[i]);
-
-		return true;
-	}
-
-	typedef std::unordered_map<uint64_t, unsigned int> AddrMap_t;
-	typedef std::unordered_map<unsigned int, AddrMap_t> LineAddrMap_t;
-
-	class File
-	{
-	public:
-		File(const std::string &filename) :
-				m_filename(filename), m_local(false)
-		{
-			void *data;
-			size_t size;
-
-			data = read_file(&size, "%s", filename.c_str());
-			panic_if(!data, "File %s exists, but can't be read???", filename.c_str());
-			m_checksum = hash_block(data, size);
-			m_fileTimestamp = get_file_timestamp(filename.c_str());
-
-			free((void *) data);
-		}
-
-		void setLocal()
-		{
-			m_local = true;
-		}
-
-		void addLine(unsigned int lineNr, uint64_t addr)
-		{
-			m_lines[lineNr][addr]++;
-		}
-
-		void registerHits(uint64_t addr, unsigned int hits)
-		{
-			m_addrHits[addr] += hits;
-		}
-
-		std::string m_filename;
-		uint64_t m_fileTimestamp;
-		LineAddrMap_t m_lines;
-		AddrMap_t m_addrHits;
-		uint32_t m_checksum;
-		bool m_local;
-	};
-
-	typedef std::vector<ICollector::IListener *> CollectorListenerList_t;
-	typedef std::unordered_map<std::string, File *> FileByNameMap_t;
-	typedef std::unordered_map<uint64_t, File *> FileByAddressMap_t;
-	typedef std::unordered_map<uint64_t, uint64_t> FileLineByAddress_t;
-	typedef std::unordered_map<uint64_t, unsigned long> AddrToHitsMap_t;
-	typedef std::unordered_map<uint64_t, unsigned long> AddressByFileLine_t;
-	typedef std::vector<IFileParser::ILineListener *> LineListenerList_t;
-
-	// All files in the current coverage session
-	FileByNameMap_t m_files;
-	FileByAddressMap_t m_filesByAddress;
-	FileLineByAddress_t m_fileLineByAddress;
-	AddrToHitsMap_t m_pendingHits;
-
-	LineListenerList_t m_lineListeners;
-	const std::string m_baseDirectory;
-	const std::string m_outputDirectory;
-
-	CollectorListenerList_t m_collectorListeners;
-	IFilter &m_filter;
-};
-
-namespace kcov
-{
-IMergeParser &createMergeParser(IReporter &reporter, const std::string &baseDirectory, const std::string &outputDirectory,
-		IFilter &filter)
-{
-	return *new MergeParser(reporter, baseDirectory, outputDirectory, filter);
-}
-}
diff --git a/kcov-38/src/merge-parser.hh b/kcov-38/src/merge-parser.hh
deleted file mode 100644
index 8053a578dca4..000000000000
--- a/kcov-38/src/merge-parser.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <reporter.hh>
-
-#include <string>
-
-namespace kcov
-{
-	class IFileParser;
-
-	class IMergeParser :
-		public IFileParser,
-		public IReporter::IListener,
-		public IWriter,
-		public ICollector
-	{
-	};
-
-	IMergeParser &createMergeParser(IReporter &reporter,
-			const std::string &baseDirectory,
-			const std::string &outputDirectory,
-			IFilter &filter);
-}
diff --git a/kcov-38/src/output-handler.cc b/kcov-38/src/output-handler.cc
deleted file mode 100644
index 3d51674feed5..000000000000
--- a/kcov-38/src/output-handler.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-#include <output-handler.hh>
-#include <writer.hh>
-#include <configuration.hh>
-#include <reporter.hh>
-#include <collector.hh>
-#include <file-parser.hh>
-#include <utils.hh>
-
-#include <list>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-
-namespace kcov
-{
-	class OutputHandler :
-			public IOutputHandler,
-			public ICollector::IEventTickListener
-	{
-	public:
-		OutputHandler(IReporter &reporter, ICollector *collector)
-		{
-			IConfiguration &conf = IConfiguration::getInstance();
-
-			m_baseDirectory = conf.keyAsString("out-directory");
-			m_outDirectory = conf.keyAsString("target-directory") + "/";
-			m_summaryDbFileName = m_outDirectory + "/summary.db";
-			m_outputInterval = conf.keyAsInt("output-interval");
-
-			m_lastTimestamp = get_ms_timestamp();
-
-			std::string readableName = fmt("%s/%s", m_baseDirectory.c_str(),  conf.keyAsString("binary-name").c_str());
-
-			(void)mkdir(m_baseDirectory.c_str(), 0755);
-			(void)mkdir(m_outDirectory.c_str(), 0755);
-
-			(void)unlink(readableName.c_str());
-			if (symlink(m_outDirectory.c_str(), readableName.c_str()) < 0)
-			{
-				kcov_debug(INFO_MSG, "Can't symlink readable name\n");
-			}
-
-			if (collector)
-				collector->registerEventTickListener(*this);
-		}
-
-		~OutputHandler()
-		{
-			stop();
-
-			// Delete all writers
-			for (WriterList_t::iterator it = m_writers.begin();
-					it != m_writers.end();
-					++it)
-			{
-				IWriter *cur = *it;
-
-				delete cur;
-			}
-		}
-
-		const std::string &getBaseDirectory()
-		{
-			return m_baseDirectory;
-		}
-
-
-		const std::string &getOutDirectory()
-		{
-			return m_outDirectory;
-		}
-
-		void registerWriter(IWriter &writer)
-		{
-			m_writers.push_back(&writer);
-		}
-
-		void start()
-		{
-			for (WriterList_t::const_iterator it = m_writers.begin();
-					it != m_writers.end();
-					++it)
-				(*it)->onStartup();
-		}
-
-		void stop()
-		{
-			for (WriterList_t::const_iterator it = m_writers.begin();
-					it != m_writers.end();
-					++it)
-				(*it)->onStop();
-
-			// Produce output after stop if anyone yields new data in onStop()
-			produce();
-		}
-
-		void produce()
-		{
-			for (WriterList_t::const_iterator it = m_writers.begin();
-					it != m_writers.end();
-					++it)
-				(*it)->write();
-		}
-
-		// From ICollector::IEventTickListener
-		void onTick()
-		{
-			if (m_outputInterval == 0)
-				return;
-
-			if (get_ms_timestamp() - m_lastTimestamp >= m_outputInterval)
-			{
-				produce();
-
-				// Take a new timestamp since producing might take a long time
-				m_lastTimestamp = get_ms_timestamp();
-			}
-		}
-
-
-	private:
-		typedef std::vector<IWriter *> WriterList_t;
-
-		std::string m_outDirectory;
-		std::string m_baseDirectory;
-		std::string m_summaryDbFileName;
-
-		WriterList_t m_writers;
-
-		unsigned int m_outputInterval;
-		uint64_t m_lastTimestamp;
-	};
-
-	static OutputHandler *instance;
-	IOutputHandler &IOutputHandler::create(IReporter &reporter, ICollector *collector)
-	{
-		if (!instance)
-			instance = new OutputHandler(reporter, collector);
-
-		return *instance;
-	}
-
-	IOutputHandler &IOutputHandler::getInstance()
-	{
-		return *instance;
-	}
-}
diff --git a/kcov-38/src/parser-manager.cc b/kcov-38/src/parser-manager.cc
deleted file mode 100644
index 77e77cf435ec..000000000000
--- a/kcov-38/src/parser-manager.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <file-parser.hh>
-#include <utils.hh>
-
-#include <vector>
-
-using namespace kcov;
-
-class ParserManager: public IParserManager
-{
-public:
-	ParserManager()
-	{
-	}
-
-	void registerParser(IFileParser &parser)
-	{
-		m_parsers.push_back(&parser);
-	}
-
-	IFileParser *matchParser(const std::string &fileName)
-	{
-		IFileParser *best = NULL;
-		size_t sz;
-
-		uint8_t *data = (uint8_t *) peek_file(&sz, "%s", fileName.c_str());
-
-		if (!data)
-			return NULL;
-
-		for (ParserList_t::const_iterator it = m_parsers.begin(); it != m_parsers.end(); ++it)
-		{
-			unsigned int myVal = (*it)->matchParser(fileName, data, sz);
-			if (myVal == match_none)
-				continue;
-
-			if (!best)
-				best = *it;
-
-			unsigned int bestVal = best->matchParser(fileName, data, sz);
-
-			if (myVal > bestVal)
-				best = *it;
-		}
-
-		free((void *) data);
-
-		return best;
-	}
-
-private:
-	typedef std::vector<IFileParser *> ParserList_t;
-
-	ParserList_t m_parsers;
-};
-
-static ParserManager *g_instance;
-IParserManager &IParserManager::getInstance()
-{
-	if (!g_instance)
-		g_instance = new ParserManager();
-
-	return *g_instance;
-}
diff --git a/kcov-38/src/parsers/bfd-disassembler.cc b/kcov-38/src/parsers/bfd-disassembler.cc
deleted file mode 100644
index 43653ee07c94..000000000000
--- a/kcov-38/src/parsers/bfd-disassembler.cc
+++ /dev/null
@@ -1,439 +0,0 @@
-#include <disassembler.hh>
-#include <utils.hh>
-
-#include <unordered_map>
-#include <set>
-#include <map>
-#include <algorithm>
-
-#ifndef ATTRIBUTE_FPTR_PRINTF_2
-# define ATTRIBUTE_FPTR_PRINTF_2
-#endif
-
-#include <bfd.h>
-#include <dis-asm.h>
-
-#include <elf.h>
-
-using namespace kcov;
-
-const uint64_t BT_INVALID = 0xfffffffffffffffeull;
-
-const std::set<std::string> x86BranchInstructions =
-{
-		"ja",
-		"jae",
-		"jbe",
-		"jc",
-		"je",
-		"jg",
-		"jge",
-		"jl",
-		"jle",
-		"jna",
-		"jnae",
-		"jnb",
-		"jnbe",
-		"jnc",
-		"jne",
-		"jng",
-		"jnge",
-		"jnl",
-		"jnle",
-		"jno",
-		"jnp",
-		"jns",
-		"jnz",
-		"jo",
-		"jp",
-		"jpe",
-		"jpo",
-		"js",
-		"jz",
-		"jczx"
-		"jezx"
-
-		"loop",
-
-		"jmp",
-
-		"call",
-
-		"ret",
-};
-
-/*
- * Since binutils >= 2.29 or so, print_insn_i386 is no longer defined in
- * dis-asm.h. I'm not sure what the correct and backwards compatible way
- * of handling this is, so define it here.
- */
-extern "C" int print_insn_i386              (bfd_vma, disassemble_info *);
-
-class BfdDisassembler : public IDisassembler
-{
-public:
-	BfdDisassembler()
-	{
-		memset(&m_info, 0, sizeof(m_info));
-		init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic);
-		m_disassembler = print_insn_i386;
-
-		m_info.arch = bfd_arch_i386;
-
-		disassemble_init_for_target(&m_info);
-		m_info.application_data = (void *)this;
-	}
-
-	virtual void setup(const void *header, size_t headerSize)
-	{
-		const uint8_t *data = (const uint8_t *)header;
-
-		panic_if(headerSize <= EI_CLASS,
-				"Header size must be at least %u", EI_CLASS);
-
-		if (data[EI_CLASS] == ELFCLASS64)
-			m_info.mach = bfd_mach_x86_64;
-		else
-			m_info.mach = bfd_mach_i386_i386;
-	}
-
-	void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress)
-	{
-		SectionCache_t::iterator it = m_cache.find(baseAddress);
-
-		// Not visited before
-		if (it == m_cache.end())
-			m_cache[baseAddress] = new Section(sectionData, sectionSize, baseAddress);
-	}
-
-	bool verify(uint64_t address)
-	{
-		Section *p = lookupSection(address);
-
-		if (!p)
-			return true;
-
-		if (!p->isDisassembled())
-			p->disassemble(*this, m_info, m_disassembler);
-
-		// The address is valid there is an instruction starting at it
-		return getInstruction(address) != NULL;
-	}
-
-	const std::vector<uint64_t> &getBasicBlock(uint64_t address)
-	{
-		if (m_bbs.empty())
-			setupBasicBlocks();
-
-		if (m_instructions.find(address) == m_instructions.end())
-			return m_empty;
-
-		return m_instructions[address].getBasicBlock()->getInstructionAddresses();
-	}
-
-private:
-	class BasicBlock
-	{
-	public:
-		BasicBlock()
-		{
-		}
-
-		const std::vector<uint64_t> &getInstructionAddresses() const
-		{
-			return m_instructionAddresses;
-		}
-
-		void addInstructionAddress(uint64_t address)
-		{
-			m_instructionAddresses.push_back(address);
-		}
-
-	private:
-		std::vector<uint64_t> m_instructionAddresses;
-	};
-
-	class Instruction
-	{
-	public:
-		Instruction(uint64_t branchTarget = 0) :
-			m_branchTarget(branchTarget),
-			m_leader(false),
-			m_bb(NULL)
-		{
-		}
-
-		uint64_t getBranchTarget() const
-		{
-			return m_branchTarget;
-		}
-
-		bool isBranch() const
-		{
-			return m_branchTarget != BT_INVALID;
-		}
-
-		bool isLeader() const
-		{
-			return m_leader;
-		}
-
-		void makeLeader()
-		{
-			m_leader = true;
-		}
-
-		const BasicBlock *getBasicBlock() const
-		{
-			return m_bb;
-		}
-
-		void setBasicBlock(const BasicBlock *bb)
-		{
-			m_bb = bb;
-		}
-
-	private:
-		uint64_t m_branchTarget;
-		bool m_leader;
-		const BasicBlock *m_bb;
-	};
-
-	class Section
-	{
-	public:
-		Section(const void *data, size_t size, uint64_t startAddress) :
-			m_size(size),
-			m_startAddress(startAddress),
-			m_disassembled(false)
-		{
-			m_data = xmalloc(size);
-			memcpy(m_data, data, size);
-		}
-
-		uint64_t getBase() const
-		{
-			return m_startAddress;
-		}
-
-		size_t getSize() const
-		{
-			return m_size;
-		}
-
-		bool isDisassembled() const
-		{
-			return m_disassembled;
-		}
-
-		void disassemble(BfdDisassembler &target, struct disassemble_info info, disassembler_ftype disassembler)
-		{
-			if (m_disassembled)
-					return;
-
-			m_disassembled = true;
-
-			info.buffer_vma = 0;
-			info.buffer_length = m_size;
-			info.buffer = (bfd_byte *)m_data;
-			info.stream = (void *)&target;
-
-			uint64_t pc = 0;
-			int count;
-			do
-			{
-				target.m_instructionVector.clear();
-				count = disassembler(pc, &info);
-
-				if (count < 0)
-					break;
-
-				target.m_instructions[pc + m_startAddress] = target.instructionFactory(pc, target.m_instructionVector);
-				// Point back into the other map
-				target.m_orderedInstructions[pc + m_startAddress] = &target.m_instructions[pc + m_startAddress];
-
-				pc += count;
-			} while (count > 0 && pc < m_size);
-		}
-
-	private:
-		void *m_data;
-		const size_t m_size;
-		const uint64_t m_startAddress;
-
-		bool m_disassembled; // Lazy disassembly once it's used
-	};
-
-	// Implementation taken from EmilPRO, https://github.com/SimonKagstrom/emilpro
-	Instruction instructionFactory(uint64_t pc, const std::vector<std::string> &vec)
-	{
-		uint64_t branchTarget = BT_INVALID; // Invalid
-
-		// No encoding???
-		if (vec.size() < 1)
-			return Instruction();
-
-		std::set<std::string>::const_iterator it = x86BranchInstructions.find(vec[0]);
-
-		// Address?
-		if (it != x86BranchInstructions.end() &&
-				vec.size() >= 2 && string_is_integer(vec[1]))
-		{
-			int64_t offset = string_to_integer(vec[1]);
-
-			// FIXME! Check if this is correct
-			if ( (offset & (1 << 31)) )
-				offset |= 0xffffffff00000000ULL;
-
-			branchTarget = pc + offset;
-		}
-
-		return Instruction(branchTarget);
-	}
-
-	Section *lookupSection(uint64_t address)
-	{
-		SectionCache_t::iterator it = m_cache.lower_bound(address);
-
-		if (it == m_cache.end())
-			return NULL;
-		--it;
-
-		// Above the last symbol
-		if (it == m_cache.end())
-			return NULL;
-
-		Section *cur = it->second;
-		uint64_t end = cur->getBase() + cur->getSize() - 1;
-
-		// Below nearest (possible?)
-		if (address < cur->getBase())
-			return NULL;
-
-		// Above section
-		if (address > end)
-			return NULL;
-
-		// Just right!
-		return cur;
-	}
-
-	void setupBasicBlocks()
-	{
-		for (SectionCache_t::iterator it = m_cache.begin();
-				it != m_cache.end();
-				++it)
-			it->second->disassemble(*this, m_info, m_disassembler);
-
-		InstructionOrderedMap_t::iterator cur = m_orderedInstructions.begin();
-
-		// The no-instructions program. Uncommon.
-		if (cur == m_orderedInstructions.end())
-			return;
-
-		InstructionOrderedMap_t::iterator next = cur;
-		next++;
-
-		// The first instruction is always a leader
-		cur->second->makeLeader();
-
-		// The one-instructions program. Also uncommon.
-		if (next == m_orderedInstructions.end())
-			return;
-
-		// Iterate the instruction pairs
-		for (; next != m_orderedInstructions.end(); ++cur, ++next)
-		{
-			// Mark branch targets as leaders, as well as the instruction after that
-			if (cur->second->isBranch())
-			{
-				m_instructions[cur->second->getBranchTarget()].makeLeader();
-				next->second->makeLeader();
-			}
-		}
-
-		// Create and populate basic blocks
-		BasicBlock *bb = NULL;
-
-		m_bbs.push_back(bb);
-		for (InstructionOrderedMap_t::iterator it = m_orderedInstructions.begin();
-				it != m_orderedInstructions.end();
-				++it)
-		{
-			Instruction *cur = it->second;
-
-			if (cur->isLeader())
-			{
-				bb = new BasicBlock();
-				m_bbs.push_back(bb);
-			}
-
-			cur->setBasicBlock(bb);
-			bb->addInstructionAddress(it->first);
-		}
-	}
-
-
-	Instruction *getInstruction(uint64_t address)
-	{
-		if (m_instructions.find(address) == m_instructions.end())
-			return NULL;
-
-		return &m_instructions[address];
-	}
-
-
-
-	void opcodesFprintFunc(const char *str)
-	{
-		std::string stdStr(str);
-
-		m_instructionVector.push_back(trim_string(stdStr));
-	}
-
-	static int opcodesFprintFuncStatic(void *info, const char *fmt, ...)
-	{
-		BfdDisassembler *pThis = (BfdDisassembler *)info;
-		char str[64];
-		int out;
-
-		va_list args;
-		va_start (args, fmt);
-		out = vsnprintf( str, sizeof(str) - 1, fmt, args );
-		va_end (args);
-
-		pThis->opcodesFprintFunc(str);
-
-		return out;
-	}
-
-	typedef std::map<uint64_t, Section *> SectionCache_t;
-	typedef std::unordered_map<uint64_t, Instruction> InstructionAddressMap_t;
-	typedef std::map<uint64_t, Instruction *> InstructionOrderedMap_t;
-
-	struct disassemble_info m_info;
-	disassembler_ftype m_disassembler;
-
-
-	std::vector<std::string> m_instructionVector;
-
-	SectionCache_t m_cache;
-	InstructionAddressMap_t m_instructions;
-	InstructionOrderedMap_t m_orderedInstructions;
-
-	std::vector<BasicBlock *> m_bbs;
-	std::vector<uint64_t> m_empty;
-};
-
-IDisassembler &IDisassembler::getInstance()
-{
-	static BfdDisassembler *g_p;
-
-	if (!g_p)
-	{
-		bfd_init();
-		g_p = new BfdDisassembler();
-	}
-
-	return *g_p;
-}
diff --git a/kcov-38/src/parsers/dummy-disassembler.cc b/kcov-38/src/parsers/dummy-disassembler.cc
deleted file mode 100644
index 2c8523b45a0c..000000000000
--- a/kcov-38/src/parsers/dummy-disassembler.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <disassembler.hh>
-
-using namespace kcov;
-
-class DummyDisassembler : public IDisassembler
-{
-public:
-	virtual void setup(const void *header, size_t headerSize)
-	{
-	}
-
-	void addSection(const void *sectionData, size_t sectionSize, uint64_t baseAddress)
-	{
-	}
-
-	const std::vector<uint64_t> &getBasicBlock(uint64_t address)
-	{
-		return m_empty;
-	}
-
-	bool verify(uint64_t offset)
-	{
-		/*
-		 * ARM and PowerPC have fixed-length instructions, so this is actually
-		 * a valid way of validating.
-		 *
-		 * Of course, it would be better if we knew if thumb mode was used.
-		 */
-#if defined(__arm__)
-		return (offset & 1) == 0; // Thumb-conservative
-#elif defined(__powerpc__)
-		return (offset & 3) == 0;
-#endif
-
-		return true;
-	}
-
-	std::vector<uint64_t> m_empty;
-};
-
-IDisassembler &IDisassembler::getInstance()
-{
-	static DummyDisassembler *g_p;
-
-	if (!g_p)
-		g_p = new DummyDisassembler();
-
-	return *g_p;
-}
diff --git a/kcov-38/src/parsers/dwarf-libdwarf.cc b/kcov-38/src/parsers/dwarf-libdwarf.cc
deleted file mode 100644
index 56eaefb427bc..000000000000
--- a/kcov-38/src/parsers/dwarf-libdwarf.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-#include "dwarf.hh"
-
-#include <utils.hh>
-
-#include <dwarf.h>
-#include <libdwarf/libdwarf.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-
-using namespace kcov;
-
-static void dwarf_error_handler(Dwarf_Error error, Dwarf_Ptr userData)
-{
-	char *msg = dwarf_errmsg(error);
-
-	printf("Dwarf: %s\n", msg);
-}
-
-class DwarfParser::Impl
-{
-public:
-	Impl() :
-	m_fd(-1),
-	m_dwarf(NULL)
-	{
-	}
-
-	int m_fd;
-	Dwarf_Debug m_dwarf;
-};
-
-DwarfParser::DwarfParser()
-{
-	m_impl = new DwarfParser::Impl();
-}
-
-DwarfParser::~DwarfParser()
-{
-	close();
-	delete m_impl;
-}
-
-void DwarfParser::forEachLine(IFileParser::ILineListener& listener)
-{
-	Dwarf_Unsigned header;
-
-	/* Iterate over the headers */
-	while (dwarf_next_cu_header(m_impl->m_dwarf, 0, 0, 0, 0, &header, 0) == DW_DLV_OK)
-	{
-		Dwarf_Line* line_buffer;
-		Dwarf_Signed line_count;
-		Dwarf_Die die;
-		int i;
-
-		if (dwarf_siblingof(m_impl->m_dwarf, 0, &die, 0) != DW_DLV_OK)
-			continue;
-
-		/* Get the source lines */
-		if (dwarf_srclines(die, &line_buffer, &line_count, 0) != DW_DLV_OK)
-			continue;
-
-		/* Store them */
-		for (i = 0; i < line_count; i++)
-		{
-			Dwarf_Unsigned line_nr;
-			char* line_source;
-			Dwarf_Bool is_code;
-			Dwarf_Addr addr;
-
-
-			if (dwarf_lineno(line_buffer[i], &line_nr, 0) != DW_DLV_OK)
-				continue;
-			if (dwarf_linesrc(line_buffer[i], &line_source, 0) != DW_DLV_OK)
-				continue;
-			if (dwarf_linebeginstatement(line_buffer[i], &is_code, 0) != DW_DLV_OK)
-				continue;
-
-			if (dwarf_lineaddr(line_buffer[i], &addr, 0) != DW_DLV_OK)
-				continue;
-
-			if (line_nr && is_code)
-			{
-				static char *srcDirs[1] = {NULL};
-				listener.onLine(fullPath(srcDirs, line_source), line_nr, addr);
-			}
-
-			dwarf_dealloc(m_impl->m_dwarf, line_source, DW_DLA_STRING);
-		}
-	}
-}
-
-void DwarfParser::forAddress(IFileParser::ILineListener& listener, uint64_t address)
-{
-	panic("NYI");
-}
-
-
-std::string DwarfParser::fullPath(const char *const *srcDirs, const std::string &filename)
-{
-	/* Use the full compilation path unless the source already
-	 * has an absolute path */
-	std::string fullFilePath;
-	std::string filePath = filename;
-
-	std::string dir = srcDirs[0] == NULL ? "" : srcDirs[0];
-	fullFilePath = dir_concat(dir, filename);
-	if (filename[0] != '/')
-		filePath = fullFilePath;
-
-	return filePath;
-}
-
-
-
-bool DwarfParser::open(const std::string& filename)
-{
-	close();
-
-	m_impl->m_fd = ::open(filename.c_str(), O_RDONLY);
-
-	if (m_impl->m_fd < 0)
-		return false;
-
-	/* Initialize libdwarf */
-	int err = dwarf_init(m_impl->m_fd, DW_DLC_READ, dwarf_error_handler, 0, &m_impl->m_dwarf,0);
-	if (err == DW_DLV_ERROR)
-	{
-		::close(m_impl->m_fd);
-		m_impl->m_fd = -1;
-
-		return false;
-	}
-
-	return true;
-}
-
-void DwarfParser::close()
-{
-	if (m_impl->m_fd < 0)
-		return;
-
-	dwarf_finish(m_impl->m_dwarf, 0);
-
-	::close(m_impl->m_fd);
-
-	m_impl->m_fd = -1;
-	m_impl->m_dwarf = NULL;
-}
diff --git a/kcov-38/src/parsers/dwarf.cc b/kcov-38/src/parsers/dwarf.cc
deleted file mode 100644
index 3578096d96ec..000000000000
--- a/kcov-38/src/parsers/dwarf.cc
+++ /dev/null
@@ -1,229 +0,0 @@
-#include "dwarf.hh"
-
-#include <utils.hh>
-
-#include <elfutils/libdw.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-
-using namespace kcov;
-
-class DwarfParser::Impl
-{
-public:
-	Impl() :
-	m_fd(-1),
-	m_dwarf(NULL)
-	{
-	}
-
-	int m_fd;
-	Dwarf *m_dwarf;
-};
-
-DwarfParser::DwarfParser()
-{
-	m_impl = new DwarfParser::Impl();
-}
-
-DwarfParser::~DwarfParser()
-{
-	close();
-	delete m_impl;
-}
-
-void DwarfParser::forEachLine(IFileParser::ILineListener& listener)
-{
-	if (!m_impl->m_dwarf)
-		return;
-
-	Dwarf_Off offset = 0;
-	Dwarf_Off lastOffset = 0;
-	size_t headerSize;
-
-	/* Iterate over the headers */
-	while (dwarf_nextcu(m_impl->m_dwarf, offset, &offset, &headerSize, 0, 0, 0) == 0)
-	{
-		Dwarf_Lines* lines;
-		Dwarf_Files *files;
-		size_t lineCount;
-		size_t fileCount;
-		Dwarf_Die die;
-		unsigned int i;
-
-		if (dwarf_offdie(m_impl->m_dwarf, lastOffset + headerSize, &die) == NULL)
-			continue;
-
-		lastOffset = offset;
-
-		/* Get the source lines */
-		if (dwarf_getsrclines(&die, &lines, &lineCount) != 0)
-			continue;
-
-		/* And the files */
-		if (dwarf_getsrcfiles(&die, &files, &fileCount) != 0)
-			continue;
-
-		const char *const *srcDirs;
-		size_t ndirs = 0;
-
-		/* Lookup the compilation path */
-		if (dwarf_getsrcdirs(files, &srcDirs, &ndirs) != 0)
-			continue;
-
-		if (ndirs == 0)
-			continue;
-
-		/* Iterate through the source lines */
-		for (i = 0; i < lineCount; i++)
-		{
-			Dwarf_Line *line;
-			int lineNr = 0;
-			const char* lineSource;
-			Dwarf_Word mtime, len;
-			bool isCode;
-			Dwarf_Addr addr;
-
-			if ( !(line = dwarf_onesrcline(lines, i)) )
-				continue;
-
-			if (dwarf_lineno(line, &lineNr) != 0)
-				continue;
-
-			if (!(lineSource = dwarf_linesrc(line, &mtime, &len)) )
-				continue;
-
-			if (dwarf_linebeginstatement(line, &isCode) != 0)
-				continue;
-
-			if (dwarf_lineaddr(line, &addr) != 0)
-				continue;
-
-			// Invalid line number?
-			if (lineNr == 0)
-				continue;
-
-			// Non-code?
-			if (!isCode)
-				continue;
-
-			listener.onLine(fullPath(srcDirs, lineSource), lineNr, addr);
-		}
-	}
-}
-
-void DwarfParser::forAddress(IFileParser::ILineListener& listener, uint64_t address)
-{
-	if (!m_impl->m_dwarf)
-		return;
-
-	Dwarf_Off offset = 0;
-	Dwarf_Off lastOffset = 0;
-	size_t headerSize;
-
-	if (!m_impl->m_dwarf)
-		return;
-
-	/* Iterate over the headers */
-	while (dwarf_nextcu(m_impl->m_dwarf, offset, &offset, &headerSize, 0, 0, 0) == 0)
-	{
-		Dwarf_Die die;
-
-		if (dwarf_offdie(m_impl->m_dwarf, lastOffset + headerSize, &die) == NULL)
-		{
-			lastOffset = offset;
-			continue;
-		}
-
-		lastOffset = offset;
-
-		Dwarf_Line *line;
-		Dwarf_Files *files;
-		size_t fileCount;
-
-		line = dwarf_getsrc_die(&die, address);
-		if (!line)
-			continue;
-
-		/* And the files */
-		if (dwarf_getsrcfiles(&die, &files, &fileCount) != 0)
-			continue;
-
-		const char* lineSource;
-		Dwarf_Word mtime, len;
-
-		if (!(lineSource = dwarf_linesrc(line, &mtime, &len)) )
-			return;
-
-		const char *const *srcDirs;
-		size_t ndirs = 0;
-
-		/* Lookup the compilation path */
-		if (dwarf_getsrcdirs(files, &srcDirs, &ndirs) != 0)
-			continue;
-
-		int lineNr;
-
-		if (dwarf_lineno(line, &lineNr) != 0)
-			continue;
-
-		listener.onLine(fullPath(srcDirs, lineSource), lineNr, address);
-	}
-}
-
-
-std::string DwarfParser::fullPath(const char *const *srcDirs, const std::string &filename)
-{
-	/* Use the full compilation path unless the source already
-	 * has an absolute path */
-	std::string fullFilePath;
-	std::string filePath = filename;
-
-	std::string dir = srcDirs[0] == NULL ? "" : srcDirs[0];
-	fullFilePath = dir_concat(dir, filename);
-	if (filename[0] != '/')
-		filePath = fullFilePath;
-
-	return filePath;
-}
-
-
-
-bool DwarfParser::open(const std::string& filename)
-{
-	close();
-
-	m_impl->m_fd = ::open(filename.c_str(), O_RDONLY);
-
-	if (m_impl->m_fd < 0)
-		return false;
-
-	/* Initialize libdwarf from the file descriptor */
-	m_impl->m_dwarf = dwarf_begin(m_impl->m_fd, DWARF_C_READ);
-
-	if (!m_impl->m_dwarf)
-	{
-		::close(m_impl->m_fd);
-		m_impl->m_fd = -1;
-
-		return false;
-	}
-
-	return true;
-}
-
-void DwarfParser::close()
-{
-	if (m_impl->m_dwarf)
-		dwarf_end(m_impl->m_dwarf);
-
-	if (m_impl->m_fd >= 0)
-		::close(m_impl->m_fd);
-
-	m_impl->m_fd = -1;
-	m_impl->m_dwarf = NULL;
-}
diff --git a/kcov-38/src/parsers/dwarf.hh b/kcov-38/src/parsers/dwarf.hh
deleted file mode 100644
index 98ea5a4f49fe..000000000000
--- a/kcov-38/src/parsers/dwarf.hh
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-#include <file-parser.hh>
-
-namespace kcov
-{
-	class DwarfParser
-	{
-	public:
-		DwarfParser();
-
-		~DwarfParser();
-
-		bool open(const std::string &filename);
-
-		void forEachLine(IFileParser::ILineListener &listener);
-
-		void forAddress(IFileParser::ILineListener &listener, uint64_t address);
-
-	private:
-		class Impl;
-
-		std::string fullPath(const char *const *srcDirs, const std::string &filename);
-
-		void close();
-
-		Impl *m_impl;
-	};
-}
diff --git a/kcov-38/src/parsers/elf-parser.cc b/kcov-38/src/parsers/elf-parser.cc
deleted file mode 100644
index 283d5570f554..000000000000
--- a/kcov-38/src/parsers/elf-parser.cc
+++ /dev/null
@@ -1,585 +0,0 @@
-#include <file-parser.hh>
-#include <engine.hh>
-#include <utils.hh>
-#include <capabilities.hh>
-#include <gcov.hh>
-#include <phdr_data.h>
-#include <disassembler.hh>
-#include <elf.hh>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <libelf.h>
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-#include <map>
-#include <vector>
-#include <string>
-#include <configuration.hh>
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#include <link.h>
-
-#include <filter.hh>
-#include <libgen.h>
-
-#include "dwarf.hh"
-
-using namespace kcov;
-
-enum SymbolType
-{
-	SYM_NORMAL = 0, SYM_DYNAMIC = 1,
-};
-typedef std::vector<Segment> SegmentList_t;
-
-class ElfInstance : public IFileParser, IFileParser::ILineListener
-{
-public:
-	ElfInstance() : m_addressVerifier(IDisassembler::getInstance())
-	{
-		m_elf = NULL;
-		m_filename = "";
-		m_checksum = 0;
-		m_elfIs32Bit = true;
-		m_elfIsShared = false;
-		m_isMainFile = true;
-		m_initialized = false;
-		m_filter = NULL;
-		m_verifyAddresses = false;
-		m_debuglinkCrc = 0;
-		m_relocation = 0;
-		m_invalidBreakpoints = 0;
-
-		IParserManager::getInstance().registerParser(*this);
-	}
-
-	virtual ~ElfInstance()
-	{
-	}
-
-	uint64_t getChecksum()
-	{
-		return m_checksum;
-	}
-
-	std::string getParserType()
-	{
-		return "ELF";
-	}
-
-	bool elfIs64Bit()
-	{
-		return !m_elfIs32Bit;
-	}
-
-	void setupParser(IFilter *filter)
-	{
-		m_filter = filter;
-	}
-
-	enum IFileParser::PossibleHits maxPossibleHits()
-	{
-		return IFileParser::HITS_LIMITED; // Breakpoints are cleared after a hit
-	}
-
-	unsigned int matchParser(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		Elf32_Ehdr *hdr = (Elf32_Ehdr *) data;
-
-		if (memcmp(hdr->e_ident, ELFMAG, strlen(ELFMAG)) == 0)
-			return match_perfect;
-
-		return match_none;
-	}
-
-	bool addFile(const std::string &filename, struct phdr_data_entry *data)
-	{
-		if (!m_initialized)
-		{
-			m_verifyAddresses = IConfiguration::getInstance().keyAsInt("verify");
-
-			panic_if(elf_version(EV_CURRENT) == EV_NONE, "ELF version failed\n");
-			m_initialized = true;
-		}
-
-		m_filename = filename;
-
-		m_buildId.clear();
-		m_debuglink.clear();
-
-		m_curSegments.clear();
-		m_executableSegments.clear();
-		for (uint32_t i = 0; data && i < data->n_segments; i++)
-		{
-			struct phdr_data_segment *seg = &data->segments[i];
-
-			m_curSegments.push_back(Segment(NULL, seg->paddr, seg->vaddr, seg->size));
-		}
-
-		if (!checkFile())
-			return false;
-
-		for (FileListenerList_t::const_iterator it = m_fileListeners.begin(); it != m_fileListeners.end(); ++it)
-			(*it)->onFile(File(m_filename, m_isMainFile ? IFileParser::FLG_NONE : IFileParser::FLG_TYPE_SOLIB));
-
-		return true;
-	}
-
-	bool checkFile()
-	{
-		struct Elf *elf;
-		bool out = true;
-		int fd;
-
-		fd = ::open(m_filename.c_str(), O_RDONLY, 0);
-		if (fd < 0)
-		{
-			kcov_debug(ELF_MSG, "Cannot open %s\n", m_filename.c_str());
-			return false;
-		}
-
-		if (!(elf = elf_begin(fd, ELF_C_READ, NULL)))
-		{
-			error("elf_begin failed on %s\n", m_filename.c_str());
-			out = false;
-			goto out_open;
-		}
-		if (elf_kind(elf) == ELF_K_NONE)
-			out = false;
-
-		if (m_isMainFile)
-		{
-			char *raw;
-			size_t sz;
-			uint16_t e_type;
-
-			raw = elf_getident(elf, &sz);
-
-			if (raw && sz > EI_CLASS)
-			{
-				ICapabilities &capabilities = ICapabilities::getInstance();
-
-				m_elfIs32Bit = raw[EI_CLASS] == ELFCLASS32;
-
-				if (elfIs64Bit() != machine_is_64bit())
-					capabilities.removeCapability("handle-solibs");
-				else
-					capabilities.addCapability("handle-solibs");
-			}
-
-			e_type = m_elfIs32Bit ? elf32_getehdr(elf)->e_type : elf64_getehdr(elf)->e_type;
-
-			m_elfIsShared = e_type == ET_DYN;
-			if (!m_checksum)
-			{
-				m_checksum = m_elfIs32Bit ? elf32_checksum(elf) : elf64_checksum(elf);
-			}
-		}
-
-		elf_end(elf);
-
-		out_open: close(fd);
-
-		return out;
-	}
-
-	bool parse()
-	{
-		bool out = true;
-
-		// should defer until setMainFileRelocation
-		if (m_isMainFile && m_elfIsShared)
-		{
-
-			// ... but this needs to be done if we don't have solibs
-			if (!IConfiguration::getInstance().keyAsInt("parse-solibs"))
-				setMainFileRelocation(0);
-		}
-		else
-		{
-			out = doParse(0);
-		}
-
-		m_isMainFile = false;
-
-		return out;
-	}
-
-	bool doParse(unsigned long relocation)
-	{
-		struct stat st;
-
-		if (lstat(m_filename.c_str(), &st) < 0)
-			return false;
-
-		parseOneElf();
-
-		setupSections();
-
-		// Gcov data?
-		if (IConfiguration::getInstance().keyAsInt("gcov") && !m_gcnoFiles.empty())
-			parseGcnoFiles(relocation);
-		else
-			parseOneDwarf(relocation);
-
-		return true;
-	}
-
-	bool setMainFileRelocation(unsigned long relocation)
-	{
-		kcov_debug(INFO_MSG, "main file relocation = %#lx\n", relocation);
-
-		if (m_elfIsShared)
-		{
-			if (!doParse(relocation))
-				return false;
-		}
-		else
-		{
-			// this situation is probably problematic, as we have already notified
-			// segment informations to the listeners.
-			if (relocation != 0)
-			{
-				warning("Got a static executable with relocation=%#lx, "
-						"probably the trace wouldn't work.", relocation);
-			}
-		}
-
-		return true;
-	}
-
-	void parseGcnoFiles(unsigned long relocation)
-	{
-		for (FileList_t::const_iterator it = m_gcnoFiles.begin(); it != m_gcnoFiles.end(); ++it)
-		{
-			const std::string &cur = *it;
-
-			parseOneGcno(cur, relocation);
-		}
-	}
-
-	void parseOneGcno(const std::string &filename, unsigned long relocation)
-	{
-		size_t sz;
-		void *data;
-
-		// The data is freed by the parser
-		data = read_file(&sz, "%s", filename.c_str());
-		if (!data)
-			return;
-
-		// Parse this gcno file!
-		GcnoParser parser((uint8_t *) data, sz);
-
-		// Parsing error?
-		if (!parser.parse())
-		{
-			warning("Can't parse %s\n", filename.c_str());
-
-			return;
-		}
-
-		const GcnoParser::BasicBlockList_t &bbs = parser.getBasicBlocks();
-
-		for (GcnoParser::BasicBlockList_t::const_iterator it = bbs.begin(); it != bbs.end(); ++it)
-		{
-			const GcnoParser::BasicBlockMapping &cur = *it;
-
-			// Report a generated address
-			for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
-				(*it)->onLine(cur.m_file, cur.m_line,
-						gcovGetAddress(cur.m_file, cur.m_function, cur.m_basicBlock, cur.m_index) + relocation);
-		}
-	}
-
-	void setupSections()
-	{
-		for (SegmentList_t::const_iterator it = m_executableSegments.begin(); it != m_executableSegments.end(); ++it)
-		{
-			m_addressVerifier.addSection(it->getData(), it->getSize(), it->getBase());
-		}
-	}
-
-	bool parseOneDwarf(unsigned long relocation)
-	{
-		m_invalidBreakpoints = 0;
-		m_relocation = relocation;
-
-		DwarfParser dp;
-
-		bool rv = dp.open(m_filename);
-
-		if (!rv && m_buildId.length() > 0)
-		{
-			/* Look for separate debug info: build-ids */
-			std::string debug_file = std::string(
-					"/usr/lib/debug/.build-id/" + m_buildId.substr(0, 2) + "/" + m_buildId.substr(2, std::string::npos)
-							+ ".debug");
-
-			rv = dp.open(debug_file);
-			if (!rv && m_isMainFile)
-				kcov_debug(ELF_MSG, "Cannot open %s\n", debug_file.c_str());
-		}
-
-		if (!rv && m_debuglink.length() > 0)
-		{
-			/* Look for separate debug info: debug-links */
-			std::string debugPath = lookupDebuglinkFile();
-
-			if (debugPath == "" && m_isMainFile)
-				kcov_debug(ELF_MSG, "Cannot open debug-link file in standard locations\n");
-			else
-				rv = dp.open(debugPath);
-		}
-
-		if (!rv)
-		{
-			if (m_isMainFile)
-				warning("kcov requires binaries built with -g/-ggdb, a build-id file\n"
-						"or GNU debug link information.\n");
-			kcov_debug(ELF_MSG, "No debug symbols in %s.\n", m_filename.c_str());
-
-			return false;
-		}
-
-		/* Iterate over the headers */
-		dp.forEachLine(*this);
-
-		if (m_invalidBreakpoints > 0)
-		{
-			kcov_debug(STATUS_MSG, "kcov: %u invalid breakpoints skipped in %s\n", m_invalidBreakpoints, m_filename.c_str());
-		}
-
-		return true;
-	}
-
-	bool parseOneElf()
-	{
-		m_elf = IElf::create(m_filename);
-
-		if (!m_elf)
-			return false;
-
-		size_t sz;
-		void *p;
-
-		p = m_elf->getRawData(sz);
-		m_addressVerifier.setup(p, EI_NIDENT);
-
-		SegmentList_t segments = m_elf->getSegments();
-		if (m_curSegments.empty())
-			m_curSegments = segments;
-
-		for (SegmentList_t::iterator it = segments.begin(); it != segments.end(); ++it)
-			m_executableSegments.push_back(*it);
-
-		// Gcov data
-		std::vector<std::string> gcdaFiles = m_elf->getGcovGcdaFiles();
-		for (std::vector<std::string>::iterator it = gcdaFiles.begin(); it != gcdaFiles.end(); ++it)
-		{
-			for (FileListenerList_t::const_iterator lit = m_fileListeners.begin(); lit != m_fileListeners.end(); ++lit)
-				(*lit)->onFile(File(*it, IFileParser::FLG_TYPE_COVERAGE_DATA));
-		}
-
-		m_gcnoFiles = m_elf->getGcovGcnoFiles();
-		m_buildId = m_elf->getBuildId();
-
-		const std::pair<std::string, uint32_t> *dbgLink = m_elf->getDebugLink();
-		if (dbgLink)
-		{
-			m_debuglink = dbgLink->first;
-			m_debuglinkCrc = dbgLink->second;
-		}
-
-		return true;
-	}
-
-	void registerLineListener(IFileParser::ILineListener &listener)
-	{
-		m_lineListeners.push_back(&listener);
-	}
-
-	void registerFileListener(IFileParser::IFileListener &listener)
-	{
-		m_fileListeners.push_back(&listener);
-	}
-
-private:
-	typedef std::vector<IFileParser::ILineListener *> LineListenerList_t;
-	typedef std::vector<IFileListener *> FileListenerList_t;
-	typedef std::vector<std::string> FileList_t;
-
-	bool addressIsValid(uint64_t addr, unsigned &invalidBreakpoints) const
-	{
-		for (SegmentList_t::const_iterator it = m_executableSegments.begin(); it != m_executableSegments.end(); ++it)
-		{
-			if (it->addressIsWithinSegment(addr))
-			{
-				bool out = true;
-
-				if (m_verifyAddresses)
-				{
-					out = m_addressVerifier.verify(addr);
-
-					if (!out)
-					{
-						kcov_debug(ELF_MSG, "kcov: Address 0x%llx is not at an instruction boundary, skipping\n",
-								(unsigned long long) addr);
-						invalidBreakpoints++;
-					}
-				}
-
-				return out;
-			}
-		}
-
-		return false;
-	}
-
-	uint64_t adjustAddressBySegment(uint64_t addr)
-	{
-		for (SegmentList_t::const_iterator it = m_curSegments.begin(); it != m_curSegments.end(); ++it)
-		{
-			if (it->addressIsWithinSegment(addr))
-			{
-				addr = it->adjustAddress(addr);
-				break;
-			}
-		}
-
-		return addr;
-	}
-
-	// From IFileParser::ILineListener
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-		if (!addressIsValid(addr, m_invalidBreakpoints))
-			return;
-
-		std::string rp = m_filter->mangleSourcePath(file);
-
-		for (LineListenerList_t::const_iterator it = m_lineListeners.begin(); it != m_lineListeners.end(); ++it)
-			(*it)->onLine(rp, lineNr, adjustAddressBySegment(addr) + m_relocation);
-	}
-
-	std::string tryDebugLink(const std::string &path)
-	{
-		if (!file_exists(path))
-			return "";
-
-		size_t sz;
-		uint8_t *p = (uint8_t *) read_file(&sz, "%s", path.c_str());
-		if (!p)
-			return "";
-		uint32_t crc = debugLinkCrc32(0, p, sz);
-		free(p);
-
-		if (crc != m_debuglinkCrc)
-		{
-			kcov_debug(ELF_MSG, "CRC mismatch for debug link %s. Should be 0x%08x, is 0x%08x!\n", path.c_str(),
-					m_debuglinkCrc, crc);
-			return "";
-		}
-
-		return path;
-	}
-
-	std::string lookupDebuglinkFile()
-	{
-		std::string filePath;
-		std::string debugPath;
-		char *cpy;
-
-		cpy = ::strdup(m_filename.c_str());
-		filePath = std::string(::dirname(cpy));
-		free(cpy);
-
-		// Use debug link from the ELF (same directory as binary)
-		debugPath = tryDebugLink(fmt("%s/%s", filePath.c_str(), m_debuglink.c_str()));
-		if (debugPath != "")
-			return debugPath;
-
-		// Same directory .debug
-		debugPath = tryDebugLink(fmt("%s/.debug/%s", filePath.c_str(), m_debuglink.c_str()));
-		if (debugPath != "")
-			return debugPath;
-
-		return tryDebugLink(fmt("/usr/lib/debug/%s/%s", get_real_path(filePath).c_str(), m_debuglink.c_str()));
-	}
-
-	// From https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
-	uint32_t debugLinkCrc32(uint32_t crc, unsigned char *buf, size_t len)
-	{
-		static const uint32_t crc32_table[256] =
-		{ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832,
-				0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-				0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a,
-				0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-				0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-				0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-				0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
-				0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-				0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
-				0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-				0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074,
-				0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-				0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525,
-				0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-				0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-				0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-				0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76,
-				0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-				0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
-				0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-				0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
-				0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-				0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7,
-				0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-				0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-				0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-				0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330,
-				0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-				0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
-		unsigned char *end;
-
-		crc = ~crc & 0xffffffff;
-		for (end = buf + len; buf < end; ++buf)
-			crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
-
-		return ~crc & 0xffffffff;
-	}
-
-	SegmentList_t m_curSegments;
-	SegmentList_t m_executableSegments;
-	FileList_t m_gcnoFiles;
-
-	IDisassembler &m_addressVerifier;
-	bool m_verifyAddresses;
-	IElf *m_elf;
-	bool m_elfIs32Bit;
-	bool m_elfIsShared;
-	LineListenerList_t m_lineListeners;
-	FileListenerList_t m_fileListeners;
-	std::string m_filename;
-	std::string m_buildId;
-	std::string m_debuglink;
-	uint32_t m_debuglinkCrc;
-	bool m_isMainFile;
-	uint64_t m_checksum;
-	bool m_initialized;
-	uint64_t m_relocation;
-	uint32_t m_invalidBreakpoints;
-
-	/***** Add strings to update path information. *******/
-	std::string m_origRoot;
-	std::string m_newRoot;
-
-	IFilter *m_filter;
-};
-
-static ElfInstance g_instance;
diff --git a/kcov-38/src/parsers/elf.cc b/kcov-38/src/parsers/elf.cc
deleted file mode 100644
index 4faa3d8c7352..000000000000
--- a/kcov-38/src/parsers/elf.cc
+++ /dev/null
@@ -1,275 +0,0 @@
-#include <elf.hh>
-
-#include <configuration.hh>
-
-#include <elfutils/libdw.h>
-
-using namespace kcov;
-
-class ElfImpl : public IElf
-{
-public:
-	ElfImpl(void *data, size_t size) :
-			m_debugLinkValid(false), m_fileData((char *) data), m_fileSize(size)
-	{
-		parse();
-	}
-
-	~ElfImpl()
-	{
-	}
-
-	virtual const std::vector<std::string> &getGcovGcdaFiles()
-	{
-		return m_gcdaFiles;
-	}
-
-	virtual const std::vector<std::string> &getGcovGcnoFiles()
-	{
-		return m_gcnoFiles;
-	}
-
-	virtual const std::string &getBuildId()
-	{
-		return m_buildId;
-	}
-
-	virtual const std::pair<std::string, uint32_t> *getDebugLink()
-	{
-		if (m_debugLinkValid)
-			return &m_debugLink;
-
-		return NULL;
-	}
-
-	virtual const std::vector<Segment> &getSegments()
-	{
-		return m_segments;
-	}
-
-	virtual void *getRawData(size_t &sz)
-	{
-		sz = m_fileSize;
-		return m_fileData;
-	}
-
-private:
-	typedef std::vector<std::string> FileList_t;
-
-	bool parse()
-	{
-		struct Elf *elf;
-		bool elfIs32Bit = true;
-
-		Elf_Scn *scn = NULL;
-		size_t shstrndx;
-		bool ret = false;
-		bool doScanForGcda = IConfiguration::getInstance().keyAsInt("gcov");
-		unsigned int i;
-		char *raw;
-		size_t sz;
-
-		if (!(elf = elf_memory((char *) m_fileData, m_fileSize)))
-		{
-			error("elf_begin failed\n");
-			return false;
-		}
-
-		if (elf_getshdrstrndx(elf, &shstrndx) < 0)
-		{
-			error("elf_getshstrndx failed\n");
-			goto out_elf_begin;
-		}
-
-		raw = elf_getident(elf, &sz);
-
-		if (raw && sz > EI_CLASS)
-			elfIs32Bit = raw[EI_CLASS] == ELFCLASS32;
-
-		while ((scn = elf_nextscn(elf, scn)) != NULL)
-		{
-			uint64_t sh_type;
-			uint64_t sh_addr;
-			uint64_t sh_size;
-			uint64_t sh_flags;
-			uint64_t sh_name;
-			uint64_t sh_offset;
-			uint64_t n_namesz;
-			uint64_t n_descsz;
-			uint64_t n_type;
-			char *n_data;
-			char *name;
-
-			if (elfIs32Bit)
-			{
-				Elf32_Shdr *shdr32 = elf32_getshdr(scn);
-
-				sh_type = shdr32->sh_type;
-				sh_addr = shdr32->sh_addr;
-				sh_size = shdr32->sh_size;
-				sh_flags = shdr32->sh_flags;
-				sh_name = shdr32->sh_name;
-				sh_offset = shdr32->sh_offset;
-			}
-			else
-			{
-				Elf64_Shdr *shdr64 = elf64_getshdr(scn);
-
-				sh_type = shdr64->sh_type;
-				sh_addr = shdr64->sh_addr;
-				sh_size = shdr64->sh_size;
-				sh_flags = shdr64->sh_flags;
-				sh_name = shdr64->sh_name;
-				sh_offset = shdr64->sh_offset;
-			}
-
-			Elf_Data *data = elf_getdata(scn, NULL);
-
-			// Nothing there?
-			if (!data)
-				continue;
-
-			if (!data->d_buf)
-				continue;
-
-			name = elf_strptr(elf, shstrndx, sh_name);
-			if (!data)
-			{
-				error("elf_getdata failed on section %s\n", name);
-				goto out_elf_begin;
-			}
-
-			// Parse rodata to find gcda files
-			if (doScanForGcda && strcmp(name, ".rodata") == 0)
-			{
-				const char *dataPtr = (const char *) data->d_buf;
-
-				for (size_t i = 0; i < data->d_size - 5; i++)
-				{
-					const char *p = &dataPtr[i];
-
-					if (memcmp(p, (const void *) "gcda\0", 5) != 0)
-						continue;
-
-					const char *gcda = p;
-
-					// Rewind to start of string
-					while (gcda != dataPtr && *gcda != '\0')
-						gcda--;
-
-					// Rewound until start of rodata?
-					if (gcda == dataPtr)
-						continue;
-
-					std::string file(gcda + 1);
-
-					m_gcdaFiles.push_back(file);
-				}
-			}
-
-			if (sh_type == SHT_NOTE)
-			{
-				if (elfIs32Bit)
-				{
-					Elf32_Nhdr *nhdr32 = (Elf32_Nhdr *) data->d_buf;
-
-					n_namesz = nhdr32->n_namesz;
-					n_descsz = nhdr32->n_descsz;
-					n_type = nhdr32->n_type;
-					n_data = (char *) data->d_buf + sizeof(Elf32_Nhdr);
-				}
-				else
-				{
-					Elf64_Nhdr *nhdr64 = (Elf64_Nhdr *) data->d_buf;
-
-					n_namesz = nhdr64->n_namesz;
-					n_descsz = nhdr64->n_descsz;
-					n_type = nhdr64->n_type;
-					n_data = (char *) data->d_buf + sizeof(Elf64_Nhdr);
-				}
-
-				if (::strcmp(n_data, ELF_NOTE_GNU) == 0 && n_type == NT_GNU_BUILD_ID)
-				{
-					const char *hex_digits = "0123456789abcdef";
-					unsigned char *build_id;
-
-					build_id = (unsigned char *) n_data + n_namesz;
-					for (i = 0; i < n_descsz; i++)
-					{
-						m_buildId.push_back(hex_digits[(build_id[i] >> 4) & 0xf]);
-						m_buildId.push_back(hex_digits[(build_id[i] >> 0) & 0xf]);
-					}
-				}
-			}
-
-			// Check for debug links
-			if (strcmp(name, ".gnu_debuglink") == 0)
-			{
-				const char *p = (const char *) data->d_buf;
-				m_debugLink.first.append(p);
-				const char *endOfString = p + strlen(p) + 1;
-
-				// Align address for the CRC32
-				unsigned long addr = (unsigned long) (endOfString - p);
-				unsigned long offs = 0;
-
-				if ((addr & 3) != 0)
-					offs = 4 - (addr & 3);
-				// ... and read out the CRC32
-				memcpy((void *) &m_debugLink.second, endOfString + offs, sizeof(m_debugLink.second));
-				m_debugLinkValid = true;
-			}
-
-			if ((sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) != (SHF_EXECINSTR | SHF_ALLOC))
-				continue;
-
-			Segment seg(m_fileData + sh_offset, sh_addr, sh_addr, sh_size);
-
-			m_segments.push_back(seg);
-		}
-
-		// If we have gcda files, try to find the corresponding gcno dittos
-		for (FileList_t::iterator it = m_gcdaFiles.begin(); it != m_gcdaFiles.end(); ++it)
-		{
-			std::string &gcno = *it; // Modify in-place
-			size_t sz = gcno.size();
-
-			// .gcda -> .gcno
-			gcno[sz - 2] = 'n';
-			gcno[sz - 1] = 'o';
-
-			if (file_exists(gcno))
-				m_gcnoFiles.push_back(gcno);
-		}
-
-		ret = true;
-
-out_elf_begin:
-		elf_end(elf);
-
-		return ret;
-	}
-
-	std::vector<std::string> m_gcnoFiles;
-	std::vector<std::string> m_gcdaFiles;
-	std::string m_buildId;
-	bool m_debugLinkValid;
-	std::pair<std::string, uint32_t> m_debugLink;
-	std::vector<Segment> m_segments;
-
-	char *m_fileData;
-	size_t m_fileSize;
-};
-
-IElf *IElf::create(const std::string &filename)
-{
-	size_t sz;
-	void *data;
-
-	// The data is freed by the parser
-	data = read_file(&sz, "%s", filename.c_str());
-	if (!data)
-		return NULL;
-
-	return new ElfImpl(data, sz);
-}
diff --git a/kcov-38/src/parsers/libdwarf-dwarf.cpp b/kcov-38/src/parsers/libdwarf-dwarf.cpp
deleted file mode 100644
index 249ec33356e8..000000000000
--- a/kcov-38/src/parsers/libdwarf-dwarf.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-//  libdwarf-dwarf.cpp
-//  kcov
-//
-//  Created by Simon Kågström on 31/10/16.
-//
-//
-
-#include <stdio.h>
diff --git a/kcov-38/src/reporter.cc b/kcov-38/src/reporter.cc
deleted file mode 100644
index c599c3d93f64..000000000000
--- a/kcov-38/src/reporter.cc
+++ /dev/null
@@ -1,788 +0,0 @@
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <collector.hh>
-#include <utils.hh>
-#include <filter.hh>
-#include <configuration.hh>
-#include <source-file-cache.hh>
-
-#include <string>
-#include <list>
-#include <unordered_map>
-#include <functional>
-#include <map>
-#include <fstream>
-
-#include "swap-endian.hh"
-
-using namespace kcov;
-
-#define KCOV_MAGIC      0x6b636f76 /* "kcov" */
-#define KCOV_DB_VERSION 6
-
-struct marshalHeaderStruct
-{
-	uint32_t magic;
-	uint32_t db_version;
-	uint64_t checksum;
-};
-
-class Reporter : public IReporter,
-		public IFileParser::ILineListener,
-		public IFileParser::IFileListener,
-		public ICollector::IListener,
-		public IReporter::IListener
-{
-public:
-	Reporter(IFileParser &fileParser, ICollector &collector, IFilter &filter) :
-			m_fileParser(fileParser), m_collector(collector), m_filter(filter), m_maxPossibleHits(
-					fileParser.maxPossibleHits()), m_unmarshallingDone(false), m_order(1) // "First" hit - 0 marks unset
-	{
-		m_fileParser.registerLineListener(*this);
-		m_fileParser.registerFileListener(*this);
-		m_collector.registerListener(*this);
-
-		m_hashFilename = fileParser.getParserType() == "ELF";
-
-		m_dbFileName = IConfiguration::getInstance().keyAsString("target-directory") + "/coverage.db";
-	}
-
-	~Reporter()
-	{
-		writeCoverageDatabase();
-
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *cur = it->second;
-
-			delete cur;
-		}
-	}
-
-	void registerListener(IReporter::IListener &listener)
-	{
-		m_listeners.push_back(&listener);
-	}
-
-	bool fileIsIncluded(const std::string &file)
-	{
-		return m_filter.runFilters(file);
-	}
-
-	bool lineIsCode(const std::string &file, unsigned int lineNr)
-	{
-		FileMap_t::iterator it = m_files.find(file);
-
-		// Not code if the file doesn't exist!
-		if (it == m_files.end())
-			return false;
-
-		return it->second->lineIsCode(lineNr);
-	}
-
-	LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr)
-	{
-		unsigned int hits = 0;
-		unsigned int possibleHits = 0;
-		uint64_t order = 0;
-
-		FileMap_t::const_iterator it = m_files.find(file);
-
-		if (it != m_files.end())
-		{
-			const Line *line = it->second->getLine(lineNr);
-
-			if (line && !line->isUnreachable())
-			{
-				hits = line->hits();
-				possibleHits = line->possibleHits(m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
-				order = line->getOrder();
-			}
-		}
-
-		return LineExecutionCount(hits, possibleHits, order);
-	}
-
-	ExecutionSummary getExecutionSummary()
-	{
-		unsigned int executedLines = 0;
-		unsigned int nrLines = 0;
-
-		// Summarize all files
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			const std::string &fileName = it->first;
-			const File *file = it->second;
-
-			// Don't include non-existing files in summary
-			if (!file_exists(fileName))
-				continue;
-
-			// And not filtered ones either
-			if (!m_filter.runFilters(fileName))
-				continue;
-
-			executedLines += file->getExecutedLines();
-			nrLines += file->getNrLines();
-		}
-
-		return ExecutionSummary(nrLines, executedLines);
-	}
-
-	void *marshal(size_t *szOut)
-	{
-		size_t sz = getMarshalSize();
-		void *start;
-		uint8_t *p;
-
-		start = malloc(sz);
-		if (!start)
-			return NULL;
-		memset(start, 0, sz);
-		p = marshalHeader((uint8_t *) start);
-
-		// Marshal all lines in the files
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			const File *cur = it->second;
-
-			p = cur->marshal(p, *this);
-		}
-
-		*szOut = sz;
-
-		return start;
-	}
-
-	bool unMarshal(void *data, size_t sz)
-	{
-		uint8_t *start = (uint8_t *) data;
-		uint8_t *p = start;
-		size_t n;
-
-		p = unMarshalHeader(p);
-
-		if (!p)
-			return false;
-
-		n = (sz - (p - start)) / getMarshalEntrySize();
-
-		for (size_t i = 0; i < n; i++)
-		{
-			uint64_t fileHash;
-			uint64_t addr;
-			uint64_t hits;
-			uint64_t addrIndex;
-
-			p = Line::unMarshal(p, &addr, &hits, &fileHash, &addrIndex);
-
-			if (!hits)
-				continue;
-
-			AddrToLineMap_t::iterator it = m_addrToLine.find(addr);
-
-			/*
-			 * Can't find this file/line
-			 *
-			 * Either it doesn't exist in the binary, or it hasn't been parsed
-			 * yet, which will be the case for bash/python. Add it to pending
-			 * addresses if so.
-
-			 * Typically because it's in a shared library, which hasn't been
-			 * loaded yet.
-			 */
-			if (it == m_addrToLine.end())
-			{
-				LineIdToFileMap_t::iterator lit = m_lineIdToFileMap.find(fileHash);
-
-				if (lit == m_lineIdToFileMap.end())
-				{
-					// No line ID (shared library?). Add to pending
-					m_pendingFiles[fileHash].push_back(PendingFileAddress(addrIndex, hits));
-				}
-				else
-				{
-					// line ID exists, but not address (PIEs etc)
-					reportAddress(fileHash, hits);
-
-					lit->second->registerHitIndex(addrIndex, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
-				}
-
-				continue;
-			}
-
-			// Part of this file - just report it
-			onAddressHit(addr, hits);
-		}
-
-		return true;
-	}
-
-	virtual void writeCoverageDatabase()
-	{
-		size_t sz;
-		void *data = marshal(&sz);
-
-		if (data)
-			write_file(data, sz, "%s", m_dbFileName.c_str());
-
-		free(data);
-	}
-
-private:
-	size_t getMarshalEntrySize()
-	{
-		return 4 * sizeof(uint64_t);
-	}
-
-	size_t getMarshalSize()
-	{
-		size_t out = 0;
-
-		// Sum all file sizes
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			out += it->second->marshalSize();
-		}
-
-		return out * getMarshalEntrySize() + sizeof(struct marshalHeaderStruct);
-	}
-
-	uint8_t *marshalHeader(uint8_t *p)
-	{
-		struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)p;
-
-		hdr->magic = to_be<uint32_t>(KCOV_MAGIC);
-		hdr->db_version = to_be<uint32_t>(KCOV_DB_VERSION);
-		hdr->checksum = to_be<uint64_t>(m_fileParser.getChecksum());
-
-		return p + sizeof(struct marshalHeaderStruct);
-	}
-
-	uint8_t *unMarshalHeader(uint8_t *p)
-	{
-		struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)p;
-
-		if (be_to_host<uint32_t>(hdr->magic) != KCOV_MAGIC)
-			return NULL;
-
-		if (be_to_host<uint32_t>(hdr->db_version) != KCOV_DB_VERSION)
-			return NULL;
-
-		if (be_to_host<uint64_t>(hdr->checksum) != m_fileParser.getChecksum())
-			return NULL;
-
-		return p + sizeof(struct marshalHeaderStruct);
-	}
-
-	/* Called when the file is parsed */
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-		if (!m_filter.runFilters(file))
-			return;
-
-		kcov_debug(INFO_MSG, "REPORT %s:%u at 0x%lx\n", file.c_str(), lineNr, (unsigned long) addr);
-
-		File *fp = m_files[file];
-
-		if (!fp)
-		{
-			uint64_t hash = 0;
-
-			/*
-			 * Hash filenames for ELF parsers, the contents otherwise.
-			 *
-			 * Binaries are protected by an ELF checksum, but e.g., bash scripts need
-			 * to be identified by the contents.
-			 */
-			if (!m_hashFilename)
-			{
-				size_t sz;
-				void *data = read_file(&sz, "%s", file.c_str());
-
-				// Compute checksum by contents
-				if (data)
-					hash = hash_block(data, sz);
-
-				free(data);
-			}
-			else
-			{
-				hash = m_fileHash(file);
-			}
-
-			fp = new File(hash);
-
-			// Mark unreachable lines separately (often none)
-			const std::vector<std::string> &lines = ISourceFileCache::getInstance().getLines(file);
-			for (unsigned int nr = 1; nr <= lines.size(); nr++)
-			{
-				if (!m_filter.runLineFilters(file, lineNr, lines[nr - 1]))
-				{
-					Line *line = new Line(fp->getFileHash(), nr, true);
-
-					fp->addLine(nr, line);
-				}
-			}
-
-			m_files[file] = fp;
-		}
-
-		Line *line = fp->getLine(lineNr);
-
-		if (!line)
-		{
-
-			line = new Line(fp->getFileHash(), lineNr);
-			fp->addLine(lineNr, line);
-		}
-
-		uint64_t lineId = line->lineId();
-
-		line->addAddress(addr);
-		m_addrToLine[addr] = line;
-		m_lineIdToFileMap[lineId] = line;
-
-		// Report pending addresses for this file/line
-		PendingFilesMap_t::const_iterator it = m_pendingFiles.find(lineId);
-		if (it != m_pendingFiles.end())
-		{
-			for (PendingHitsList_t::const_iterator fit = it->second.begin(); fit != it->second.end(); ++fit)
-			{
-				const PendingFileAddress &val = *fit;
-				unsigned long hits = val.m_hits;
-				uint64_t index = val.m_index;
-
-				reportAddress(lineId, hits);
-
-				line->registerHitIndex(index, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
-			}
-
-			// Handled now
-			m_pendingFiles[lineId].clear();
-		}
-
-		for (ListenerList_t::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-			(*it)->onLineReporter(file, lineNr, lineId);
-	}
-
-	// Called when a file is added (e.g., a shared library)
-	void onFile(const IFileParser::File &file)
-	{
-		// Only unmarshal once
-		if (m_unmarshallingDone)
-			return;
-
-		if (!IConfiguration::getInstance().keyAsInt("clean-output"))
-		{
-			void *data;
-			size_t sz;
-
-			data = read_file(&sz, "%s", m_dbFileName.c_str());
-
-			if (data && !unMarshal(data, sz))
-				kcov_debug(INFO_MSG, "Can't unmarshal %s\n", m_dbFileName.c_str());
-
-			free(data);
-		}
-		m_unmarshallingDone = true;
-	}
-
-	/* Called during runtime */
-	void reportAddress(uint64_t lineHash, unsigned long hits)
-	{
-		// Report the line hash (losing partial hit info from now on, but
-		// that's only for the merge-reporter anyway)
-		for (ListenerList_t::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
-			(*it)->onAddress(lineHash, hits);
-	}
-
-	// From ICollector::IListener
-	void onAddressHit(uint64_t addr, unsigned long hits)
-	{
-		AddrToLineMap_t::iterator it = m_addrToLine.find(addr);
-
-		if (it == m_addrToLine.end())
-			return;
-
-		kcov_debug(INFO_MSG, "REPORT hit at 0x%llx\n", (unsigned long long) addr);
-		Line *line = it->second;
-
-		line->registerHit(addr, hits, m_maxPossibleHits != IFileParser::HITS_UNLIMITED);
-
-		// Setup the hit order
-		if (line->getOrder() == 0)
-		{
-			line->setOrder(m_order);
-			m_order++;
-		}
-
-		reportAddress(line->lineId(), hits);
-	}
-
-	// From IReporter::IListener - report recursively
-	void onAddress(uint64_t addr, unsigned long hits)
-	{
-	}
-
-	class Line
-	{
-	public:
-		// More efficient than an unordered_map
-		typedef std::vector<std::pair<uint64_t, int>> AddrToHitsMap_t;
-
-		Line(uint64_t fileHash, unsigned int lineNr, bool unreachable = false) :
-				m_lineId((fileHash << 32ULL) | lineNr), m_order(0), m_unreachable(unreachable)
-		{
-		}
-
-		bool isUnreachable() const
-		{
-			return m_unreachable;
-		}
-
-		uint64_t getOrder() const
-		{
-			return m_order;
-		}
-
-		void setOrder(uint64_t order)
-		{
-			m_order = order;
-		}
-
-		void addAddress(uint64_t addr)
-		{
-			// Check if it already exists
-			for (AddrToHitsMap_t::iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
-			{
-				if (it->first == addr)
-					return;
-			}
-
-			m_addrs.push_back(std::pair<uint64_t, int>(addr, 0));
-		}
-
-		void registerHit(uint64_t addr, unsigned long hits, bool singleShot)
-		{
-			AddrToHitsMap_t::iterator it;
-
-			for (it = m_addrs.begin(); it != m_addrs.end(); ++it)
-			{
-				if (it->first == addr)
-					break;
-			}
-
-			// Add one last
-			if (it == m_addrs.end())
-			{
-				m_addrs.push_back(std::pair<uint64_t, int>(addr, 0));
-				--it;
-			}
-
-			if (singleShot)
-				it->second = 1;
-			else
-				it->second += hits;
-		}
-
-		void registerHitIndex(uint64_t index, unsigned long hits, bool singleShot)
-		{
-			// Avoid broken data
-			if (m_addrs.size() <= index)
-				return;
-
-			m_addrs[index].second += hits;
-		}
-
-		void clearHits()
-		{
-			for (AddrToHitsMap_t::iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
-				it->second = 0;
-		}
-
-		unsigned int hits() const
-		{
-			unsigned int out = 0;
-
-			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
-				out += it->second;
-
-			return out;
-		}
-
-		unsigned int possibleHits(bool singleShot) const
-		{
-			if (singleShot)
-				return m_addrs.size();
-
-			return 0; // Meaning any number of hits are possible
-		}
-
-		uint64_t lineId() const
-		{
-			return m_lineId;
-		}
-
-		uint8_t *marshal(uint8_t *start, const Reporter &parent)
-		{
-			uint64_t *data = (uint64_t *) start;
-			unsigned int addrIndex = 0;
-
-			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it, addrIndex++)
-			{
-				// No hits? Ignore if so
-				if (!it->second)
-					continue;
-
-				uint64_t hash = m_lineId;
-				uint64_t addr = it->first;
-
-				// Address, hash, index and number of hits
-				*data++ = to_be<uint64_t>(addr);
-				*data++ = to_be<uint64_t>(hash);
-				*data++ = to_be<uint64_t>(addrIndex);
-				*data++ = to_be<uint64_t>(it->second);
-			}
-
-			return (uint8_t *) data;
-		}
-
-		size_t marshalSize() const
-		{
-			unsigned int n = 0;
-
-			for (AddrToHitsMap_t::const_iterator it = m_addrs.begin(); it != m_addrs.end(); ++it)
-			{
-				// No hits? Ignore if so
-				if (!it->second)
-					continue;
-
-				n++;
-			}
-
-			// Address, file hash and number of hits (64-bit values)
-			return n * sizeof(uint64_t) * 4;
-		}
-
-		static uint8_t *unMarshal(uint8_t *p, uint64_t *outAddr, uint64_t *outHits, uint64_t *outFileHash,
-				uint64_t *outIndex)
-		{
-			uint64_t *data = (uint64_t *) p;
-
-			*outAddr = be_to_host<uint64_t>(*data++);
-			*outFileHash = be_to_host<uint64_t>(*data++);
-			*outIndex = be_to_host<uint64_t>(*data++);
-			*outHits = be_to_host<uint64_t>(*data++);
-
-			return (uint8_t *) data;
-		}
-
-	private:
-		AddrToHitsMap_t m_addrs;
-		uint64_t m_lineId;
-		uint64_t m_order;
-		bool m_unreachable;
-	};
-
-	class File
-	{
-	public:
-		File(uint64_t hash) :
-				m_fileHash(hash), m_nrLines(0)
-		{
-		}
-
-		~File()
-		{
-			for (unsigned int i = 0; i < m_lines.size(); i++)
-			{
-				Line *cur = m_lines[i];
-
-				if (!cur)
-					continue;
-
-				delete cur;
-			}
-		}
-
-		void addLine(unsigned int lineNr, Line *line)
-		{
-			// Resize the vector to fit this line
-			if (lineNr >= m_lines.size())
-				m_lines.resize(lineNr + 1);
-
-			m_lines[lineNr] = line;
-			if (!line->isUnreachable())
-				m_nrLines++;
-		}
-
-		Line *getLine(unsigned int lineNr) const
-		{
-			if (lineNr >= m_lines.size())
-				return NULL;
-
-			return m_lines[lineNr];
-		}
-
-		uint64_t getFileHash() const
-		{
-			return m_fileHash;
-		}
-
-		// Marshal all line data
-		uint8_t *marshal(uint8_t *p, const Reporter &reporter) const
-		{
-			for (unsigned int i = 0; i < m_lines.size(); i++)
-			{
-				Line *cur = m_lines[i];
-
-				if (!cur)
-					continue;
-
-				p = cur->marshal(p, reporter);
-			}
-
-			return p;
-		}
-
-		size_t marshalSize() const
-		{
-			size_t out = 0;
-
-			for (unsigned int i = 0; i < m_lines.size(); i++)
-			{
-				Line *cur = m_lines[i];
-
-				if (!cur)
-					continue;
-
-				out += cur->marshalSize();
-			}
-
-			return out;
-		}
-
-		unsigned int getExecutedLines() const
-		{
-			unsigned int out = 0;
-
-			for (unsigned int i = 0; i < m_lines.size(); i++)
-			{
-				Line *cur = m_lines[i];
-
-				if (!cur)
-					continue;
-
-				if (cur->isUnreachable())
-					continue;
-
-				// Hits as zero or one (executed or not)
-				out += !!cur->hits();
-			}
-
-			return out;
-		}
-
-		unsigned int getNrLines() const
-		{
-			return m_nrLines;
-		}
-
-		bool lineIsCode(unsigned int lineNr) const
-		{
-			if (lineNr >= m_lines.size())
-				return false;
-
-			if (!m_lines[lineNr])
-				return false;
-
-			return !m_lines[lineNr]->isUnreachable();
-		}
-
-	private:
-		uint64_t m_fileHash;
-		std::vector<Line *> m_lines;
-		unsigned int m_nrLines;
-	};
-
-	class PendingFileAddress
-	{
-	public:
-		PendingFileAddress(uint64_t index, unsigned long hits) :
-				m_index(index), m_hits(hits)
-		{
-		}
-
-		uint64_t m_index;
-		unsigned long m_hits;
-	};
-
-	typedef std::unordered_map<std::string, File *> FileMap_t;
-	typedef std::unordered_map<uint64_t, Line *> AddrToLineMap_t;
-	typedef std::unordered_map<uint64_t, unsigned long> AddrToHitsMap_t;
-	typedef std::vector<IReporter::IListener *> ListenerList_t;
-	typedef std::unordered_map<uint64_t, Line *> LineIdToFileMap_t;
-	typedef std::vector<PendingFileAddress> PendingHitsList_t; // Address, hits
-	typedef std::unordered_map<uint64_t, PendingHitsList_t> PendingFilesMap_t;
-
-	FileMap_t m_files;
-	AddrToLineMap_t m_addrToLine;
-	AddrToHitsMap_t m_pendingHits;
-	ListenerList_t m_listeners;
-	PendingFilesMap_t m_pendingFiles;
-	LineIdToFileMap_t m_lineIdToFileMap;
-	std::hash<std::string> m_fileHash;
-	bool m_hashFilename;
-
-	IFileParser &m_fileParser;
-	ICollector &m_collector;
-	IFilter &m_filter;
-	enum IFileParser::PossibleHits m_maxPossibleHits;
-
-	bool m_unmarshallingDone;
-	std::string m_dbFileName;
-
-	uint64_t m_order;
-};
-
-// The merge mode doesn't have/need a proper reporter
-class DummyReporter : public IReporter
-{
-	virtual void registerListener(IListener &listener)
-	{
-	}
-
-	virtual bool fileIsIncluded(const std::string &file)
-	{
-		return false;
-	}
-
-	virtual bool lineIsCode(const std::string &file, unsigned int lineNr)
-	{
-		return false;
-	}
-
-	virtual LineExecutionCount getLineExecutionCount(const std::string &file, unsigned int lineNr)
-	{
-		return LineExecutionCount(0, 0, 0);
-	}
-	virtual ExecutionSummary getExecutionSummary()
-	{
-		return ExecutionSummary();
-	}
-
-	void writeCoverageDatabase()
-	{
-	}
-};
-
-IReporter &IReporter::create(IFileParser &parser, ICollector &collector, IFilter &filter)
-{
-	return *new Reporter(parser, collector, filter);
-}
-
-IReporter &IReporter::createDummyReporter()
-{
-	return *new DummyReporter();
-}
diff --git a/kcov-38/src/solib-handler.cc b/kcov-38/src/solib-handler.cc
deleted file mode 100644
index 7fae02eb7ac7..000000000000
--- a/kcov-38/src/solib-handler.cc
+++ /dev/null
@@ -1,281 +0,0 @@
-#include <solib-handler.hh>
-#include <collector.hh>
-#include <output-handler.hh>
-#include <configuration.hh>
-#include <capabilities.hh>
-#include <file-parser.hh>
-#include <utils.hh>
-#include <phdr_data.h>
-#include <generated-data-base.hh>
-
-#include <mutex>
-#include <vector>
-#include <unordered_map>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-
-using namespace kcov;
-
-extern GeneratedData __library_data;
-
-class SolibHandler : public ISolibHandler, ICollector::IEventTickListener
-{
-public:
-	SolibHandler(IFileParser &parser, ICollector &collector) :
-			m_ldPreloadString(NULL), m_envString(NULL), m_solibFd(-1), m_solibThreadValid(false), m_threadShouldExit(false),
-			m_parser(&parser), m_hasSetupRelocation(false)
-	{
-		memset(&m_solibThread, 0, sizeof(m_solibThread));
-
-		// Only useful for ELF binaries
-		if (parser.getParserType() == "ELF" && !IConfiguration::getInstance().keyAsInt("gcov")
-				&& !IConfiguration::getInstance().keyAsInt("clang-sanitizer"))
-			collector.registerEventTickListener(*this);
-	}
-
-	virtual ~SolibHandler()
-	{
-		void *rv;
-
-		m_threadShouldExit = true;
-		if (m_solibPath != "")
-			unlink(m_solibPath.c_str());
-		if (m_solibDirectory != "")
-			rmdir(m_solibDirectory.c_str());
-		if (m_solibFd >= 0)
-			close(m_solibFd);
-
-		/*
-		 * First kill the solib thread if it's stuck in open (i.e., before
-		 * the tracee has started), then wait for it to terminate for maximum
-		 * niceness.
-		 *
-		 * Only do this if it has been started, naturally
-		 */
-		if (m_solibThreadValid)
-		{
-			pthread_cancel(m_solibThread);
-			pthread_kill(m_solibThread, SIGTERM);
-			pthread_join(m_solibThread, &rv);
-		}
-	}
-
-	// From IEventTickListener
-	void onTick()
-	{
-		checkSolibData();
-	}
-
-	void startup()
-	{
-		if (m_parser->getParserType() != "ELF")
-			return;
-
-		std::string kcov_solib_pipe_path = IOutputHandler::getInstance().getOutDirectory() + "kcov-solib.pipe";
-		std::string kcov_solib_path = IOutputHandler::getInstance().getBaseDirectory() + "libkcov_sowrapper.so";
-
-		// Skip this very special library
-		m_foundSolibs[get_real_path(kcov_solib_path)] = true;
-
-		write_file(__library_data.data(), __library_data.size(), "%s", kcov_solib_path.c_str());
-
-		unlink(kcov_solib_pipe_path.c_str());
-
-		int rv = mkfifo(kcov_solib_pipe_path.c_str(), 0644);
-		if (rv < 0)
-		{
-			char buf[1024];
-
-			const char* tmpdir = getenv("TMPDIR");
-			if (!tmpdir)
-				tmpdir = "/tmp";
-
-			snprintf(buf, sizeof(buf), "%s/kcov-solibXXXXXX", tmpdir);
-
-			char *dir = mkdtemp(buf);
-
-			if (!dir)
-				panic("Can't create temporary directory\n");
-			m_solibDirectory = dir;
-
-			kcov_solib_pipe_path = fmt("%s/kcov-solib.pipe", dir);
-
-			rv = mkfifo(kcov_solib_pipe_path.c_str(), 0644);
-			if (rv < 0)
-				panic("Can't create kcov fifo in temp dir %s\n", dir);
-		}
-
-		std::string kcov_solib_env = "KCOV_SOLIB_PATH=" + kcov_solib_pipe_path;
-
-		free(m_envString);
-		m_envString = (char *) xmalloc(kcov_solib_env.size() + 1);
-		strcpy(m_envString, kcov_solib_env.c_str());
-
-		std::string preloadEnv = std::string("LD_PRELOAD=" + kcov_solib_path).c_str();
-		free(m_ldPreloadString);
-		m_ldPreloadString = (char *) xmalloc(preloadEnv.size() + 1);
-		strcpy(m_ldPreloadString, preloadEnv.c_str());
-
-		if (IConfiguration::getInstance().keyAsInt("parse-solibs")
-				&& ICapabilities::getInstance().hasCapability("handle-solibs"))
-		{
-			if (file_exists(kcov_solib_path))
-				putenv(m_ldPreloadString);
-		}
-		putenv(m_envString);
-
-		m_solibPath = kcov_solib_pipe_path;
-		pthread_create(&m_solibThread, NULL, SolibHandler::threadStatic, (void *) this);
-
-	}
-
-	void solibThreadParse()
-	{
-		uint8_t buf[1024 * 1024];
-
-		m_solibFd = ::open(m_solibPath.c_str(), O_RDONLY);
-		m_solibThreadValid = true;
-
-		if (m_solibFd < 0)
-			return;
-
-		while (1)
-		{
-			int r = read(m_solibFd, buf, sizeof(buf));
-
-			// The destructor will close m_solibFd, so we'll exit here in that case
-			if (r <= 0)
-				break;
-
-			panic_if((unsigned )r >= sizeof(buf), "Too much solib data read");
-
-			struct phdr_data *p = phdr_data_unmarshal(buf);
-
-			if (p)
-			{
-				size_t sz = sizeof(struct phdr_data) + p->n_entries * sizeof(struct phdr_data_entry);
-				struct phdr_data *cpy = (struct phdr_data*) xmalloc(sz);
-
-				memcpy(cpy, p, sz);
-
-				m_phdrListMutex.lock();
-				m_phdrs.push_back(cpy);
-				m_phdrListMutex.unlock();
-			}
-			m_solibDataReadSemaphore.notify();
-		}
-
-		m_solibDataReadSemaphore.notify();
-		close(m_solibFd);
-	}
-
-	void solibThreadMain()
-	{
-		while (1)
-		{
-			if (m_threadShouldExit)
-				break;
-
-			solibThreadParse();
-		}
-	}
-
-	// Wrapper for ptrace
-	static void *threadStatic(void *pThis)
-	{
-		SolibHandler *p = (SolibHandler *) pThis;
-
-		p->solibThreadMain();
-
-		return NULL;
-	}
-
-	void checkSolibData()
-	{
-		struct phdr_data *p = NULL;
-
-		if (!m_parser)
-			return;
-
-		m_phdrListMutex.lock();
-		if (!m_phdrs.empty())
-		{
-			p = m_phdrs.front();
-			m_phdrs.pop_front();
-		}
-		m_phdrListMutex.unlock();
-
-		if (!p)
-			return;
-
-		// Setup where the main file is relocated once (for PIEs)
-		if (!m_hasSetupRelocation)
-		{
-			m_hasSetupRelocation = true;
-			m_parser->setMainFileRelocation(p->relocation);
-		}
-
-		for (unsigned int i = 0; i < p->n_entries; i++)
-		{
-			struct phdr_data_entry *cur = &p->entries[i];
-
-			if (strlen(cur->name) == 0)
-				continue;
-
-			if (m_foundSolibs.find(cur->name) != m_foundSolibs.end())
-				continue;
-
-			m_parser->addFile(cur->name, cur);
-			m_parser->parse();
-
-			m_foundSolibs[cur->name] = true;
-		}
-
-		free(p);
-	}
-
-//private:
-
-	typedef std::list<struct phdr_data *> PhdrList_t;
-	typedef std::unordered_map<std::string, bool> FoundSolibsMap_t;
-
-	std::string m_solibPath;
-	std::string m_solibDirectory;
-	char *m_ldPreloadString;
-	char *m_envString;
-	int m_solibFd;
-	bool m_solibThreadValid;
-	bool m_threadShouldExit;
-	pthread_t m_solibThread;
-	Semaphore m_solibDataReadSemaphore;
-	PhdrList_t m_phdrs;
-	FoundSolibsMap_t m_foundSolibs;
-	std::mutex m_phdrListMutex;
-
-	IFileParser *m_parser;
-	bool m_hasSetupRelocation;
-};
-
-static SolibHandler *g_handler;
-ISolibHandler &kcov::createSolibHandler(IFileParser &parser, ICollector &collector)
-{
-	// OK, not very nicely encapsulated...
-	g_handler = new SolibHandler(parser, collector);
-
-	return *g_handler;
-}
-
-void kcov::blockUntilSolibDataRead()
-{
-	// If it has been started
-	if (g_handler->m_solibThreadValid)
-		g_handler->m_solibDataReadSemaphore.wait();
-}
diff --git a/kcov-38/src/solib-parser/lib.c b/kcov-38/src/solib-parser/lib.c
deleted file mode 100644
index 1aa8730db02e..000000000000
--- a/kcov-38/src/solib-parser/lib.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <link.h>
-#include <dlfcn.h>
-
-#include <phdr_data.h>
-
-static struct phdr_data *phdr_data;
-
-static int phdrCallback(struct dl_phdr_info *info, size_t size, void *data)
-{
-	// the first entry is used to determine the executable's "base address"
-	// (which is actually the relocation for PIE)
-	if (phdr_data->n_entries == 0)
-	{
-		phdr_data->relocation = info->dlpi_addr;
-	}
-
-	phdr_data_add(phdr_data, info);
-
-	return 0;
-}
-
-static int phdrSizeCallback(struct dl_phdr_info *info, size_t size, void *data)
-{
-	size_t *ps = (size_t *)data;
-
-	*ps += sizeof(struct phdr_data_entry);
-
-	return 0;
-}
-
-static void parse_solibs(void)
-{
-	char *kcov_solib_path;
-	void *p;
-	ssize_t written;
-	size_t allocSize;
-	size_t sz;
-	int fd;
-
-	kcov_solib_path = getenv("KCOV_SOLIB_PATH");
-	if (!kcov_solib_path)
-		return;
-
-	allocSize = sizeof(struct phdr_data);
-	dl_iterate_phdr(phdrSizeCallback, &allocSize);
-
-	phdr_data = phdr_data_new(allocSize);
-	if (!phdr_data)
-	{
-		fprintf(stderr, "kcov-solib: Can't allocate %zu bytes\n", allocSize);
-		return;
-	}
-
-
-	dl_iterate_phdr(phdrCallback, NULL);
-
-	p = phdr_data_marshal(phdr_data, &sz);
-
-	fd = open(kcov_solib_path, O_WRONLY);
-	if (fd < 0)
-	{
-		fprintf(stderr, "kcov-solib: Can't open %s\n", kcov_solib_path);
-		return;
-	}
-	written = write(fd, p, sz);
-
-	if (written != sz)
-		fprintf(stderr, "kcov-solib: Can't write to solib FIFO (%zu)\n", written);
-
-	phdr_data_free(p);
-
-	close(fd);
-}
-
-static void force_breakpoint(void)
-{
-	asm volatile(
-#if defined(__i386__) || defined(__x86_64__)
-			"int3\n"
-#elif defined(__powerpc__)
-			".long 0x7fe00008\n" /* trap instruction */
-#elif defined(__arm__)
-			".long 0xfedeffe7\n" /* undefined insn */
-#elif defined(__aarch64__)
-			".long 0xd4200000\n" /* From https://github.com/scottt/debugbreak */
-#else
-# error Unsupported architecture
-#endif
-			);
-}
-
-static void *(*orig_dlopen)(const char *, int);
-void *dlopen(const char *filename, int flag)
-{
-	void *out;
-
-	if (!orig_dlopen)
-		orig_dlopen = dlsym(RTLD_NEXT, "dlopen");
-
-	out = orig_dlopen(filename, flag);
-
-	parse_solibs();
-	force_breakpoint();
-
-	return out;
-}
-
-
-void  __attribute__((constructor))kcov_solib_at_startup(void)
-{
-	parse_solibs();
-	force_breakpoint();
-}
diff --git a/kcov-38/src/solib-parser/phdr_data.c b/kcov-38/src/solib-parser/phdr_data.c
deleted file mode 100644
index 57f08f3fa06f..000000000000
--- a/kcov-38/src/solib-parser/phdr_data.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#include "phdr_data.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <link.h>
-
-#define KCOV_MAGIC         0x6b636f76 /* "kcov" */
-#define KCOV_SOLIB_VERSION 3
-
-// Add symbols missing from FreeBSD's elfutils
-#ifndef __ELF_NATIVE_CLASS
-#ifdef __LP64__
-#define __ELF_NATIVE_CLASS 64
-#else
-#define __ELF_NATIVE_CLASS 32
-#endif
-#endif
-#ifndef ElfW
-// Copied from glibc's elf/link.h
-#define ElfW(type)	_ElfW (Elf, __ELF_NATIVE_CLASS, type)
-#define _ElfW(e,w,t)	_ElfW_1 (e, w, _##t)
-#define _ElfW_1(e,w,t) e##w##t
-#endif
-
-static uint8_t data_area[4 * 1024 * 1024];
-
-struct phdr_data *phdr_data_new(size_t allocSize)
-{
-	struct phdr_data *p = (struct phdr_data *)data_area;
-
-	if (allocSize > sizeof(data_area))
-		return NULL;
-
-	p->magic = KCOV_MAGIC;
-	p->version = KCOV_SOLIB_VERSION;
-	p->relocation = 0;
-	p->n_entries = 0;
-
-	return p;
-}
-
-void phdr_data_free(struct phdr_data *p)
-{
-}
-
-
-void phdr_data_add(struct phdr_data *p, struct dl_phdr_info *info)
-{
-	uint32_t n = p->n_entries + 1;
-	uint32_t curEntry = p->n_entries;
-	int phdr;
-
-	struct phdr_data_entry *cur = &p->entries[curEntry];
-
-	memset(cur, 0, sizeof(*cur));
-	strncpy(cur->name, info->dlpi_name, sizeof(cur->name) - 1);
-
-	cur->n_segments = 0;
-	for (phdr = 0; phdr < info->dlpi_phnum; phdr++)
-	{
-		const ElfW(Phdr) *curHdr = &info->dlpi_phdr[phdr];
-		struct phdr_data_segment *seg = &cur->segments[cur->n_segments];
-
-		if (curHdr->p_type != PT_LOAD)
-			continue;
-
-		if (cur->n_segments >= sizeof(cur->segments) / sizeof(cur->segments[0]))
-		{
-			fprintf(stderr, "Too many segments\n");
-			return;
-		}
-
-		seg->paddr = curHdr->p_paddr;
-		seg->vaddr = info->dlpi_addr + curHdr->p_vaddr;
-		seg->size = curHdr->p_memsz;
-
-		cur->n_segments++;
-	}
-
-	p->n_entries = n;
-}
-
-void *phdr_data_marshal(struct phdr_data *p, size_t *out_sz)
-{
-	*out_sz = sizeof(struct phdr_data) + sizeof(struct phdr_data_entry) * p->n_entries;
-
-	return (void *)p;
-}
-
-struct phdr_data *phdr_data_unmarshal(void *p)
-{
-	struct phdr_data *out = (struct phdr_data *)p;
-
-	if (out->magic != KCOV_MAGIC)
-		return NULL;
-	if (out->version != KCOV_SOLIB_VERSION)
-		return NULL;
-	// Silly amounts of entries mean broken data
-	if (out->n_entries > 0x10000)
-		return NULL;
-
-	return out;
-}
diff --git a/kcov-38/src/source-file-cache.cc b/kcov-38/src/source-file-cache.cc
deleted file mode 100644
index 6dcaf329d61c..000000000000
--- a/kcov-38/src/source-file-cache.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-#include <source-file-cache.hh>
-#include <utils.hh>
-
-#include <unordered_map>
-
-using namespace kcov;
-
-class SourceFileCache : public ISourceFileCache
-{
-public:
-	SourceFileCache() :
-		m_empty()
-	{
-	}
-
-	const std::vector<std::string> &getLines(const std::string &filePath)
-	{
-		const File &file = lookupFile(filePath);
-
-		return file.m_lines;
-	}
-
-	bool fileExists(const std::string &filePath)
-	{
-		const File &file = lookupFile(filePath);
-
-		return !file.m_lines.empty();
-	}
-
-	uint32_t getCrc(const std::string &filePath)
-	{
-		const File &file = lookupFile(filePath);
-
-		return file.m_crc;
-	}
-
-private:
-	class File
-	{
-	public:
-		File() :
-			m_data(NULL),
-			m_dataSize(0),
-			m_crc(0)
-		{
-		}
-
-		~File()
-		{
-			free((void*)m_data);
-		}
-
-		File(const uint8_t *data, size_t size) :
-			m_data(data), m_dataSize(size)
-		{
-			std::string fileData((const char*)m_data, size);
-
-			m_crc = hash_block(data, size);
-
-			m_lines = split_string(fileData, "\n");
-		}
-
-		const uint8_t *m_data;
-		size_t m_dataSize;
-		std::vector<std::string> m_lines;
-		uint32_t m_crc;
-	};
-
-	const File &lookupFile(const std::string filePath)
-	{
-		std::unordered_map<std::string, File *>::iterator it = m_files.find(filePath);
-
-		if (it != m_files.end())
-			return *it->second;
-
-		/* Doesn't exist - put it as empty in the cache */
-		if (!file_exists(filePath))
-		{
-			m_files[filePath] = &m_empty;
-
-			return m_empty;
-		}
-
-		size_t sz;
-		uint8_t *p = (uint8_t *)read_file(&sz, "%s", filePath.c_str());
-
-		// Can read?
-		if (p)
-			m_files[filePath] = new File(p, sz);
-		else // Unreadable, populate with empty
-			m_files[filePath] = &m_empty;
-
-		return *m_files[filePath];
-	}
-
-	File m_empty;
-
-	/* Pointer to avoid copies when populating the map. Move semantics
-	 * would be better, but is >= C++11.
-	 */
-	std::unordered_map<std::string, File *> m_files;
-};
-
-ISourceFileCache &ISourceFileCache::getInstance()
-{
-	static SourceFileCache *g_instance;
-
-	if (!g_instance)
-		g_instance = new SourceFileCache();
-
-	return *g_instance;
-}
diff --git a/kcov-38/src/system-mode/file-data.cc b/kcov-38/src/system-mode/file-data.cc
deleted file mode 100644
index e0d0bd9b6b72..000000000000
--- a/kcov-38/src/system-mode/file-data.cc
+++ /dev/null
@@ -1,280 +0,0 @@
-#include <system-mode/file-data.hh>
-
-#include <utils.hh>
-
-using namespace kcov;
-
-static bool unmarshalTrailer(struct trailer *p)
-{
-	// Native-endian
-	if (p->magic != TRAILER_MAGIC)
-	{
-		return false;
-	}
-	if (p->version != TRAILER_VERSION)
-	{
-		return false;
-	}
-
-	if ((p->filename_size & 7) != 0)
-	{
-		return false;
-	}
-	if ((p->options_size & 7) != 0)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-static void marshalTrailer(struct trailer *p)
-{
-}
-
-static size_t padTo8(size_t sz)
-{
-	if (sz & 7)
-	{
-		sz += 8 - (sz & 7);
-	}
-
-	return sz;
-}
-
-// Implement zlib compression later
-static uint64_t *uncompressEntries(const void *data, uint32_t compressedSize, uint32_t uncompressedSize)
-{
-	uint64_t *out = (uint64_t *)xmalloc(uncompressedSize);
-
-	memcpy(out, data, compressedSize);
-
-	return out;
-}
-
-static void *compressEntries(uint32_t &outCompressedSize, const uint64_t *data, uint32_t dataSize)
-{
-	void *out = xmalloc(dataSize);
-
-	outCompressedSize = dataSize;
-	memcpy(out, data, dataSize);
-
-	return out;
-}
-
-
-SystemModeFile::SystemModeFile() :
-		m_id(0),
-		m_data(NULL),
-		m_fileSize(0)
-{
-}
-
-SystemModeFile::~SystemModeFile()
-{
-	free(m_data);
-}
-
-
-SystemModeFile *SystemModeFile::fromRawFile(uint32_t id, const std::string &filename, const std::string &options,
-		const void *fileData, size_t fileSize)
-{
-	SystemModeFile *out = new SystemModeFile();
-
-	bool rv = out->parse(fileData, fileSize, true);
-
-	if (!rv)
-	{
-		delete out;
-		return NULL;
-	}
-
-	out->m_id = id;
-	out->m_options = options;
-	out->m_filename = filename;
-
-	return out;
-}
-
-SystemModeFile *SystemModeFile::fromProcessedFile(const void *fileData, size_t fileSize)
-{
-	SystemModeFile *out = new SystemModeFile();
-
-	bool rv = out->parse(fileData, fileSize, false);
-
-	if (!rv)
-	{
-		delete out;
-		return NULL;
-	}
-
-	return out;
-}
-
-bool SystemModeFile::parse(const void *fileData, size_t fileSize, bool isRaw)
-{
-	if (!fileData)
-	{
-		return false;
-	}
-
-	if (fileSize == 0)
-	{
-		return false;
-	}
-
-	m_data = xmalloc(fileSize);
-	memcpy(m_data, fileData, fileSize);
-	m_fileSize = fileSize;
-
-	if (isRaw)
-	{
-		// All set
-		return true;
-	}
-
-	uint8_t *p = ( uint8_t *)fileData;
-	uint8_t *trailerStart = (p + fileSize - sizeof(struct trailer));
-	struct trailer *trailer = (struct trailer *)trailerStart;
-
-	// Trailer and data must be 8-byte aligned
-	if (((unsigned long)trailer) % 8 != 0)
-	{
-		return false;
-	}
-
-	if (!unmarshalTrailer(trailer))
-	{
-		return false;
-	}
-
-	if (trailer->filename_size + trailer->options_size + trailer->compressed_size > fileSize + sizeof(*trailer))
-	{
-		return false;
-	}
-
-
-	const char *filename = (const char *)(trailerStart - trailer->compressed_size - trailer->options_size - trailer->filename_size);
-	if (filename[trailer->filename_size - 1] != '\0')
-	{
-		return false;
-	}
-
-	const char *options = (const char *)(trailerStart - trailer->compressed_size - trailer->options_size);
-	if (options[trailer->options_size - 1] != '\0')
-	{
-		return false;
-	}
-	m_filename = filename;
-	m_options = options;
-	m_id = trailer->id;
-
-	uint64_t *entries = uncompressEntries((void *)(trailerStart - trailer->compressed_size), trailer->compressed_size, trailer->uncompressed_size);
-	if (!entries)
-	{
-		return false;
-	}
-
-	m_entries.clear();
-	m_entries.reserve(trailer->n_entries);
-	for (unsigned i = 0; i < trailer->n_entries; i++)
-	{
-		addEntry(i, entries[i]);
-	}
-	free(entries);
-
-	return true;
-}
-
-void SystemModeFile::addEntry(uint32_t index, uint64_t value)
-{
-	if (m_entries.size() <= index)
-	{
-		m_entries.resize(index + 1);
-	}
-
-	m_entries[index] = value;
-}
-
-const std::vector<uint64_t> &SystemModeFile::getEntries() const
-{
-	return m_entries;
-}
-
-uint32_t SystemModeFile::getId() const
-{
-	return m_id;
-}
-
-const std::string &SystemModeFile::getOptions() const
-{
-	return m_options;
-}
-
-const std::string &SystemModeFile::getFilename() const
-{
-	return m_filename;
-}
-
-const void *SystemModeFile::getProcessedData(size_t &outSize) const
-{
-	outSize = m_fileSize;
-
-	if (m_entries.size() == 0)
-	{
-		uint8_t *out = (uint8_t*)xmalloc(outSize);
-
-		memcpy(out, m_data, m_fileSize);
-		return out;
-	}
-
-	size_t padded = padTo8(outSize);
-
-	uint32_t filenameSize;
-	uint32_t optionsSize;
-	uint32_t uncompressedSize = m_entries.size() * sizeof(uint64_t);
-	uint32_t compressedSize;
-	void *compressed = compressEntries(compressedSize, m_entries.data(), uncompressedSize);
-	if (!compressed)
-	{
-		return NULL;
-	}
-	compressedSize = padTo8(compressedSize);
-
-	filenameSize = padTo8(m_filename.size() + 1);
-	optionsSize = padTo8(m_options.size() + 1);
-
-	outSize = padded + filenameSize + optionsSize + compressedSize + sizeof(struct trailer);
-	uint8_t *out = (uint8_t*)xmalloc(outSize);
-
-	memcpy(out, m_data, m_fileSize);
-
-	uint8_t *start = out + padded;
-	char *filename = (char *)start;
-	char *options = (char *)start + filenameSize;
-	uint8_t *trailerStart = out + outSize - sizeof(trailer);
-	struct trailer *trailer = (struct trailer *)trailerStart;
-
-	strcpy(filename, m_filename.c_str());
-	options[filenameSize - 1] = '\0';
-
-	strcpy(options, m_options.c_str());
-	options[optionsSize - 1] = '\0';
-	memcpy(start + filenameSize + optionsSize, m_entries.data(), m_entries.size() * sizeof(uint64_t));
-
-	trailer->magic = TRAILER_MAGIC;
-	trailer->version = TRAILER_VERSION;
-	trailer->n_entries = m_entries.size();
-	trailer->uncompressed_size = uncompressedSize;
-	trailer->compressed_size = compressedSize;
-	trailer->filename_size = filenameSize;
-	trailer->options_size = optionsSize;
-	trailer->id = m_id;
-
-	marshalTrailer(trailer);
-
-	// Not yet implemented
-	free(compressed);
-
-	return out;
-}
diff --git a/kcov-38/src/system-mode/registration.cc b/kcov-38/src/system-mode/registration.cc
deleted file mode 100644
index 1e26c28468de..000000000000
--- a/kcov-38/src/system-mode/registration.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <system-mode/registration.hh>
-
-#include <utils.hh>
-
-static bool unmarshalProcessEntry(struct new_process_entry *p)
-{
-	// Native endian
-	if (p->magic != NEW_PROCES_MAGIC)
-	{
-		return false;
-	}
-
-	if (p->version != NEW_PROCES_VERSION)
-	{
-		return false;
-	}
-
-	if (p->entry_size < sizeof(*p) + 1) // At least '\0' for the filename
-	{
-		return false;
-	}
-
-	// Must be NULL-terminated
-	uint16_t filenameSize = p->entry_size - sizeof(*p);
-	if (p->filename[filenameSize - 1] != '\0')
-	{
-		return false;
-	}
-
-	return true;
-}
-
-static void marshalProcessEntry(struct new_process_entry *p)
-{
-	// All native endian
-}
-
-bool parseProcessEntry(struct new_process_entry *p, uint16_t &outPid, std::string &outFilename)
-{
-	if (!unmarshalProcessEntry(p))
-	{
-		return false;
-	}
-
-	outPid = p->pid;
-	outFilename = p->filename;
-
-	return true;
-}
-
-struct new_process_entry *createProcessEntry(uint16_t pid, const std::string &filename)
-{
-	uint32_t size = sizeof(struct new_process_entry) + filename.size() + 1;
-	struct new_process_entry *entry = (struct new_process_entry *)xmalloc(size);
-
-	entry->magic = NEW_PROCES_MAGIC;
-	entry->version = NEW_PROCES_VERSION;
-	entry->entry_size = size;
-
-	entry->pid = pid;
-	strcpy(entry->filename, filename.c_str());
-
-	marshalProcessEntry(entry);
-
-	return entry;
-}
diff --git a/kcov-38/src/utils.cc b/kcov-38/src/utils.cc
deleted file mode 100644
index 9b0491365007..000000000000
--- a/kcov-38/src/utils.cc
+++ /dev/null
@@ -1,722 +0,0 @@
-
-#include <sched.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <limits.h>
-#include <time.h>
-
-#include <utils.hh>
-
-#include <sstream>
-#include <fstream>
-#include <stdexcept>
-#include <algorithm>
-#include <unordered_map>
-
-int g_kcov_debug_mask = STATUS_MSG;
-static void* (*mocked_read_callback)(size_t* out_size, const char* path);
-static int (*mocked_write_callback)(const void* data, size_t size, const char* path);
-static bool (*mocked_file_exists_callback)(const std::string &path);
-static uint64_t (*mocked_get_file_timestamp_callback)(const std::string &path);
-
-void msleep(uint64_t ms)
-{
-	struct timespec ts;
-	uint64_t ns = ms * 1000 * 1000;
-
-	ts.tv_sec = ns / (1000 * 1000 * 1000);
-	ts.tv_nsec = ns % (1000 * 1000 * 1000);
-
-	nanosleep(&ts, NULL);
-}
-
-static void *read_file_int(size_t *out_size, uint64_t timeout, const char *path)
-{
-	uint8_t *data = NULL;
-	int fd;
-	size_t pos = 0;
-	const size_t chunk = 1024;
-	fd_set rfds;
-	struct timeval tv;
-	int ret;
-	int n;
-
-	if (mocked_read_callback)
-		return mocked_read_callback(out_size, path);
-
-	fd = open(path, O_RDONLY | O_NONBLOCK);
-	if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
-	{
-		msleep(timeout);
-
-		fd = open(path, O_RDONLY | O_NONBLOCK);
-	}
-
-	if (fd < 0)
-		return NULL;
-
-	tv.tv_sec = timeout / 1000;
-	tv.tv_usec = (timeout % 1000) * 10;
-
-	FD_ZERO(&rfds);
-	FD_SET(fd, &rfds);
-
-	do
-	{
-		ret = select(fd + 1, &rfds, NULL, NULL, &tv);
-		if (ret == -1)
-		{
-			close(fd);
-			free(data);
-
-			return NULL;
-		}
-		else if (ret == 0)
-		{ // Timeout
-			close(fd);
-			free(data);
-
-			return NULL;
-		}
-		data = (uint8_t *)xrealloc(data, pos + chunk);
-		memset(data + pos, 0, chunk);
-
-		n = read(fd, data + pos, chunk);
-		if (n < 0)
-		{
-			close(fd);
-			free(data);
-
-			return NULL;
-		}
-
-		pos += n;
-	} while (n == (int)chunk);
-
-	*out_size = pos;
-
-	close(fd);
-
-	return data;
-}
-
-void *read_file(size_t *out_size, const char *fmt, ...)
-{
-	char path[2048];
-	va_list ap;
-	int r;
-
-	/* Create the filename */
-	va_start(ap, fmt);
-	r = vsnprintf(path, 2048, fmt, ap);
-	va_end(ap);
-
-	panic_if (r >= 2048,
-			"Too long string!");
-
-	return read_file_int(out_size, 0, path);
-}
-
-void *peek_file(size_t *out_size, const char *fmt, ...)
-{
-	char path[2048];
-	va_list ap;
-	int r;
-
-	/* Create the filename */
-	va_start(ap, fmt);
-	r = vsnprintf(path, 2048, fmt, ap);
-	va_end(ap);
-
-	panic_if (r >= 2048,
-			"Too long string!");
-
-	/* Get the file status */
-	struct stat st;
-	if (lstat(path, &st) < 0)
-		return NULL;
-	// Regular file?
-	if (S_ISREG(st.st_mode) == 0)
-		return NULL;
-
-	// Read a little bit of the file    
-	const size_t to_read = 512;    
-	char *out = static_cast<char*>(xmalloc(to_read));
-    
-	std::ifstream str(path);
-	if (str.is_open())
-	{
-		str.read(out,to_read);
-		// If successful (all desired characters) or
-		// a non-zero number of characters were read, then succeed
-		if (str || str.gcount() > 0)
-		{
-			*out_size = str.gcount();
-		}
-		else
-		{
-			// No characters read, so fail
-			free(out);
-			out = NULL;
-		}
-		str.close();
-
-	}
-	else
-	{
-		free(out);
-		out = NULL;
-	}
-
-	return out;
-}
-
-static int write_file_int(const void *data, size_t len, uint64_t timeout, const char *path)
-{
-	int fd;
-	fd_set wfds;
-	struct timeval tv;
-	int ret = 0;
-
-	tv.tv_sec = timeout / 1000;
-	tv.tv_usec = (timeout % 1000) * 10;
-
-	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-	if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
-	{
-		msleep(timeout);
-
-		fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-		if (fd < 0 && (errno == ENXIO || errno == EWOULDBLOCK))
-			return -2;
-	}
-	if (fd < 0)
-		return fd;
-
-	FD_ZERO(&wfds);
-	FD_SET(fd, &wfds);
-
-	ret = select(fd + 1, NULL, &wfds, NULL, &tv);
-	if (ret == -1)
-	{
-		close(fd);
-
-		return ret;
-	}
-	else if (ret == 0)
-	{
-		// Timeout
-		close(fd);
-
-		return -2;
-	}
-
-	if (write(fd, data, len) != (int)len)
-		return -3;
-
-	close(fd);
-
-	return 0;
-}
-
-int write_file(const void *data, size_t len, const char *fmt, ...)
-{
-	char path[2048];
-	va_list ap;
-
-	/* Create the filename */
-	va_start(ap, fmt);
-	vsnprintf(path, 2048, fmt, ap);
-	va_end(ap);
-
-	if (mocked_write_callback)
-		return mocked_write_callback(data, len, path);
-
-	return write_file_int(data, len, 0, path);
-}
-
-
-std::string dir_concat(const std::string &dirIn, const std::string &filenameIn)
-{
-	if (dirIn == "")
-		return filenameIn;
-
-	std::string dir = dirIn;
-	std::string filename = filenameIn;
-
-	// Slash extra slashses
-	while (dir[dir.size() - 1] == '/')
-	{
-		dir = dir.substr(0, dir.size() - 1);
-	}
-
-	while (filename[0] == '/')
-	{
-		filename = filename.substr(1);
-	}
-
-	return dir + "/" + filename;
-}
-
-const char *get_home(void)
-{
-	return getenv("HOME");
-}
-
-bool file_readable(FILE *fp, unsigned int ms)
-{
-	fd_set rfds;
-	struct timeval tv;
-	int rv;
-
-	int fd = fileno(fp);
-
-	FD_ZERO(&rfds);
-	FD_SET(fd, &rfds);
-
-	tv.tv_sec = ms / 1000;
-	tv.tv_usec = (ms % 1000) * 1000;
-
-	rv = select(fd + 1, &rfds, NULL, NULL, &tv);
-
-	return rv > 0;
-}
-
-static std::unordered_map<std::string, bool> statCache;
-
-bool file_exists(const std::string &path)
-{
-	if (mocked_file_exists_callback)
-		return mocked_file_exists_callback(path);
-
-	bool out;
-
-	if (statCache.find(path) == statCache.end())
-	{
-		struct stat st;
-
-		out = lstat(path.c_str(), &st) == 0;
-
-		statCache[path] = out;
-	}
-	else
-	{
-		out = statCache[path];
-	}
-
-	return out;
-}
-
-bool executable_exists_in_path(const std::string &executableName)
-{
-	// Full path to it
-	if (file_exists(executableName))
-	{
-		return true;
-	}
-
-	std::string path = getenv("PATH");
-	std::vector<std::string> parts = split_string(path, ":");
-
-	for (std::vector<std::string>::iterator it = parts.begin();
-			it != parts.end();
-			++it)
-	{
-		std::string cur = fmt("%s/%s", it->c_str(), executableName.c_str());
-
-		if (file_exists(cur))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void mock_read_file(void *(*callback)(size_t *out_size, const char *path))
-{
-	mocked_read_callback = callback;
-}
-
-void mock_write_file(int (*callback)(const void *data, size_t size, const char *path))
-{
-	mocked_write_callback = callback;
-}
-
-void mock_file_exists(bool (*callback)(const std::string &path))
-{
-	mocked_file_exists_callback = callback;
-}
-
-
-void mock_get_file_timestamp(uint64_t (*callback)(const std::string &path))
-{
-	mocked_get_file_timestamp_callback = callback;
-}
-
-uint64_t get_file_timestamp(const std::string &path)
-{
-	if (mocked_get_file_timestamp_callback)
-		return mocked_get_file_timestamp_callback(path);
-
-	struct stat st;
-
-	// "Fail"
-	if (lstat(path.c_str(), &st) != 0)
-		return 0;
-
-	// See http://stackoverflow.com/questions/11373505/getting-the-last-modified-date-of-a-file-in-c
-#ifdef __APPLE__
-#ifndef st_mtim
-#define st_mtim st_mtimespec
-#endif
-#endif
-
-    return st.st_mtim.tv_sec;
-}
-
-static void read_write(FILE *dst, FILE *src)
-{
-	char buf[1024];
-
-	while (!feof(src))
-	{
-		int n = fread(buf, sizeof(char), sizeof(buf), src);
-
-		fwrite(buf, sizeof(char), n, dst);
-	}
-}
-
-int concat_files(const char *dst_name, const char *file_a, const char *file_b)
-{
-	FILE *dst;
-	FILE *s1, *s2;
-	int ret = -1;
-
-	dst = fopen(dst_name, "w");
-	if (!dst)
-		return -1;
-	s1 = fopen(file_a, "r");
-	if (!s1)
-		goto out_dst;
-	s2 = fopen(file_b, "r");
-	if (!s2)
-		goto out_s1;
-
-	read_write(dst, s1);
-	read_write(dst, s2);
-
-	fclose(s2);
-out_s1:
-	fclose(s1);
-out_dst:
-	fclose(dst);
-
-	return ret;
-}
-
-unsigned long get_aligned(unsigned long addr)
-{
-	return (addr / sizeof(long)) * sizeof(long);
-}
-
-unsigned long get_aligned_4b(unsigned long addr)
-{
-	return addr & ~3;
-}
-
-std::string fmt(const char *fmt, ...)
-{
-	char buf[4096];
-	va_list ap;
-	int res;
-
-	va_start(ap, fmt);
-	res = vsnprintf(buf, sizeof(buf), fmt, ap);
-	va_end(ap);
-
-	if (res >= (int)sizeof(buf))
-	{
-		std::string result;
-		result.resize(res+1);
-
-		va_start(ap, fmt);
-		res = vsnprintf(&result[0], result.size(), fmt, ap);
-		va_end(ap);
-
-		panic_if(res >= (int)result.size(),
-				"Buffer overflow");
-
-		result.resize(res);
-		return result;
-	}
-
-	return std::string(buf);
-}
-
-void mdelay(unsigned int ms)
-{
-	struct timespec ts;
-	ts.tv_sec = 0;
-	ts.tv_nsec = ms * 1000 * 1000;
-
-	nanosleep(&ts, NULL);
-}
-
-uint64_t get_ms_timestamp(void)
-{
-	static uint64_t first;
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-
-	if (first == 0)
-		first = (tv.tv_sec * 1000000ULL + tv.tv_usec) / 1000;
-
-	return ((tv.tv_sec * 1000000ULL + tv.tv_usec) / 1000) - first;
-}
-
-bool machine_is_64bit(void)
-{
-	return sizeof(unsigned long) == 8;
-}
-
-
-// http://stackoverflow.com/questions/236129/how-to-split-a-string-in-c
-static std::vector<std::string> &split(const std::string &s, char delim,
-		std::vector<std::string> &elems)
-{
-    std::stringstream ss(s);
-    std::string item;
-
-    while (std::getline(ss, item, delim))
-    {
-        elems.push_back(item);
-    }
-
-    return elems;
-}
-
-
-std::vector<std::string> split_string(const std::string &s, const char *delims)
-{
-    std::vector<std::string> elems;
-    split(s, *delims, elems);
-
-    return elems;
-}
-
-std::string trim_string(const std::string &strIn, const std::string &trimEndChars)
-{
-	std::string str = strIn;
-	size_t endpos = str.find_last_not_of(trimEndChars);
-
-	if (std::string::npos != endpos)
-		str = str.substr( 0, endpos+1 );
-
-	// trim leading spaces
-	size_t startpos = str.find_first_not_of(" \t");
-	if (std::string::npos != startpos)
-		str = str.substr( startpos );
-	else
-		str = "";
-
-	return str;
-}
-
-// Cache for ::realpath - it's apparently one of the reasons why kcov is slow
-typedef std::unordered_map<std::string, std::string> PathMap_t;
-static PathMap_t realPathCache;
-const std::string &get_real_path(const std::string &path)
-{
-	PathMap_t::const_iterator it = realPathCache.find(path);
-	if (it != realPathCache.end())
-		return it->second;
-
-	char *rp = NULL;
-
-	rp = ::realpath(path.c_str(), NULL);
-
-	if (!rp)
-		return path;
-
-	realPathCache[path] = rp;
-	free(rp);
-
-	return realPathCache[path];
-}
-
-
-bool string_is_integer(const std::string &str, unsigned base)
-{
-	size_t pos;
-
-	try
-	{
-		stoull(str, &pos, base);
-	}
-	catch(std::invalid_argument &e)
-	{
-		return false;
-	}
-	catch(std::out_of_range &e)
-	{
-		return false;
-	}
-
-	return pos == str.size();
-}
-
-int64_t string_to_integer(const std::string &str, unsigned base)
-{
-	size_t pos;
-
-	return (int64_t)stoull(str, &pos, base);
-}
-
-
-
-static char *escape_helper(char *dst, const char *what)
-{
-	int len = strlen(what);
-
-	strcpy(dst, what);
-
-	return dst + len;
-}
-
-std::string escape_html(const std::string &str)
-{
-	const char *s = str.c_str();
-	char buf[4096];
-	char *dst = buf;
-	size_t len = strlen(s);
-	bool truncated = false;
-	size_t i;
-
-	// Truncate long lines (or entries)
-	if (len > 512)
-	{
-		len = 512;
-		truncated = true;
-	}
-
-	memset(buf, 0, sizeof(buf));
-	for (i = 0; i < len; i++)
-	{
-		char c = s[i];
-
-		switch (c)
-		{
-		case '<':
-			dst = escape_helper(dst, "&lt;");
-			break;
-		case '>':
-			dst = escape_helper(dst, "&gt;");
-			break;
-		case '&':
-			dst = escape_helper(dst, "&amp;");
-			break;
-		case '\"':
-			dst = escape_helper(dst, "&quot;");
-			break;
-		case '\'':
-			dst = escape_helper(dst, "&#039;");
-			break;
-		case '/':
-			dst = escape_helper(dst, "&#047;");
-			break;
-		case '\\':
-			dst = escape_helper(dst, "&#092;");
-			break;
-		case '\n': case '\r':
-			dst = escape_helper(dst, " ");
-			break;
-		default:
-			*dst = c;
-			dst++;
-			break;
-		}
-	}
-
-	if (truncated)
-		return std::string(buf) + "...";
-
-	return std::string(buf);
-}
-
-std::string escape_json(const std::string &str)
-{
-	const std::string escapeChars = "\"\\\t\015'";
-	size_t n_escapes = 0;
-
-	for (unsigned i = 0; i < str.size(); i++)
-	{
-		for (unsigned int n = 0; n < escapeChars.size(); n++)
-		{
-			if (str[i] == escapeChars[n])
-				n_escapes++;
-		}
-	}
-
-	if (n_escapes == 0)
-		return str;
-
-	std::string out;
-	out.resize(str.size() + n_escapes);
-	unsigned cur = 0;
-
-	for (unsigned i = 0; i < str.size(); i++)
-	{
-		out[cur] = str[i];
-
-		// Special-case tabs
-		if (str[i] == '\t')
-		{
-			out[cur] = '\\';
-			cur++;
-			out[cur] = 't';
-			cur++;
-			continue;
-		}
-		// Quote quotes and backslashes
-		for (unsigned int n = 0; n < escapeChars.size(); n++)
-		{
-			if (str[i] == escapeChars[n])
-			{
-				out[cur] = '\\';
-				cur++;
-				out[cur] = str[i];
-			}
-		}
-		cur++;
-	}
-
-	return out;
-}
-
-std::pair<std::string, std::string> split_path(const std::string &pathStr)
-{
-	std::pair<std::string, std::string> out;
-	std::string path(pathStr);
-
-	size_t pos = path.rfind('/');
-
-	out.first = "";
-	out.second = path;
-	if (pos != std::string::npos)
-	{
-		out.first= path.substr(0, pos + 1);
-		out.second = path.substr(pos + 1, std::string::npos);
-	}
-
-	return out;
-}
diff --git a/kcov-38/src/writers/cobertura-writer.cc b/kcov-38/src/writers/cobertura-writer.cc
deleted file mode 100644
index 3682bdd1b491..000000000000
--- a/kcov-38/src/writers/cobertura-writer.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-namespace std
-{
-class type_info;
-}
-
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <configuration.hh>
-#include <writer.hh>
-#include <utils.hh>
-
-#include <string>
-#include <list>
-#include <vector>
-#include <unordered_map>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
-#include "writer-base.hh"
-
-using namespace kcov;
-
-class CoberturaWriter : public WriterBase
-{
-public:
-	CoberturaWriter(IFileParser &parser, IReporter &reporter, const std::string &outDir) :
-			WriterBase(parser, reporter), m_maxPossibleHits(parser.maxPossibleHits())
-	{
-		m_outFiles.push_back(outDir + "/cobertura.xml");
-		m_outFiles.push_back(outDir + "/cov.xml"); // For vscode coverage gutters
-	}
-
-	void onStartup()
-	{
-	}
-
-	void onStop()
-	{
-	}
-
-	void write()
-	{
-		std::stringstream out;
-
-		unsigned int nTotalExecutedLines = 0;
-		unsigned int nTotalCodeLines = 0;
-
-		setupCommonPaths();
-
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *file = it->second;
-
-			// Fixup file->m_codeLines etc
-			sumOne(file);
-
-			nTotalCodeLines += file->m_codeLines;
-			nTotalExecutedLines += file->m_executedLines;
-		}
-		out << getHeader(nTotalCodeLines, nTotalExecutedLines);
-
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *file = it->second;
-
-			out << writeOne(file);
-		}
-
-		out << getFooter();
-		for (std::vector<std::string>::iterator it = m_outFiles.begin();
-			it != m_outFiles.end();
-			++it)
-		{
-			std::ofstream cur(*it);
-			cur << out.str();
-		}
-	}
-
-private:
-	const std::string mangleFileName(const std::string &name)
-	{
-		std::string out = name;
-
-		for (size_t pos = 0; pos < name.size(); pos++)
-		{
-			if (out[pos] == '.' || out[pos] == '-')
-				out[pos] = '_';
-		}
-
-		return out;
-	}
-
-	void sumOne(File *file)
-	{
-		unsigned int nExecutedLines = 0;
-		unsigned int nCodeLines = 0;
-
-		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-		{
-			if (!m_reporter.lineIsCode(file->m_name, n))
-				continue;
-
-			IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
-
-			nExecutedLines += !!cnt.m_hits;
-			nCodeLines++;
-
-			unsigned int hits = cnt.m_hits;
-
-			if (hits && m_maxPossibleHits == IFileParser::HITS_SINGLE)
-				hits = 1;
-
-			// Update the execution count
-			file->m_executedLines = nExecutedLines;
-			file->m_codeLines = nCodeLines;
-		}
-	}
-
-	std::string writeOne(File *file)
-	{
-		std::string out;
-
-		std::string mangledName = mangleFileName(file->m_fileName);
-
-		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-		{
-			if (!m_reporter.lineIsCode(file->m_name, n))
-				continue;
-
-			IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
-
-			unsigned int hits = cnt.m_hits;
-
-			if (hits && m_maxPossibleHits == IFileParser::HITS_SINGLE)
-				hits = 1;
-
-			out = out + "						<line number=\"" + fmt("%u", n) + "\" hits=\"" + fmt("%u", hits) + "\"/>\n";
-		}
-
-		unsigned nCodeLines = file->m_codeLines;
-		if (nCodeLines == 0)
-			nCodeLines = 1;
-
-		std::string filename = file->m_name;
-		size_t pos = filename.find(m_commonPath);
-
-		if (pos != std::string::npos && filename.size() > m_commonPath.size())
-			filename = filename.substr(m_commonPath.size() + 1);
-
-		out = "				<class name=\"" + mangledName + "\" filename=\"" + filename + "\" branch-rate=\"1.0\" complexity=\"1.0\" line-rate=\""
-				+ fmt("%.3f", file->m_executedLines / (float) nCodeLines) + "\">\n" + "					<lines>\n" + out + "					</lines>\n"
-						"				</class>\n";
-
-		return out;
-	}
-
-	std::string getHeader(unsigned int nCodeLines, unsigned int nExecutedLines)
-	{
-		time_t t;
-		struct tm *tm;
-		char date_buf[80];
-
-		t = time(NULL);
-		tm = localtime(&t);
-		strftime(date_buf, sizeof(date_buf), "%s", tm);
-
-		std::string linesCovered = fmt("%u", nExecutedLines);
-		std::string linesValid = fmt("%u", nCodeLines);
-
-		if (nCodeLines == 0)
-			nCodeLines = 1;
-
-		std::string lineRate = fmt("%.3f", nExecutedLines / (float) nCodeLines);
-
-		return "<?xml version=\"1.0\" ?>\n"
-				"<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>\n"
-				"<coverage line-rate=\"" + lineRate + "\" lines-covered=\"" + linesCovered + "\" lines-valid=\"" + linesValid + "\" branch-rate=\"1.0\" branches-covered=\"1.0\" branches-rate=\"1.0\" complexity=\"1.0\" version=\"1.9\" timestamp=\"" + std::string(date_buf) + "\">\n"
-				"	<sources>\n"
-				"		<source>" + m_commonPath + "/</source>\n"
-				"	</sources>\n"
-				"	<packages>\n"
-				"		<package name=\"" + mangleFileName(IConfiguration::getInstance().keyAsString("command-name"))
-				+ "\" line-rate=\"" + lineRate + "\" lines-covered=\"" + linesCovered + "\" lines-valid=\"" + linesValid + "\" branch-rate=\"1.0\" complexity=\"1.0\">\n"
-						"			<classes>\n";
-	}
-
-	const std::string getFooter()
-	{
-		return "			</classes>\n"
-				"		</package>\n"
-				"	</packages>\n"
-				"</coverage>\n";
-	}
-
-	std::vector<std::string> m_outFiles;
-	IFileParser::PossibleHits m_maxPossibleHits;
-};
-
-namespace kcov
-{
-	IWriter &createCoberturaWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile)
-	{
-		return *new CoberturaWriter(parser, reporter, outFile);
-	}
-}
diff --git a/kcov-38/src/writers/cobertura-writer.hh b/kcov-38/src/writers/cobertura-writer.hh
deleted file mode 100644
index af2259bf1c56..000000000000
--- a/kcov-38/src/writers/cobertura-writer.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-	class IOutputHandler;
-
-	IWriter &createCoberturaWriter(IFileParser &elf, IReporter &reporter,
-			const std::string &outDirectory);
-}
diff --git a/kcov-38/src/writers/coveralls-writer.cc b/kcov-38/src/writers/coveralls-writer.cc
deleted file mode 100644
index aad5ca5d4e0d..000000000000
--- a/kcov-38/src/writers/coveralls-writer.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Writer for the "coveralls.io" web service.
- */
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <configuration.hh>
-#include <writer.hh>
-#include <utils.hh>
-
-#include <string>
-#include <list>
-#include <unordered_map>
-#include <iostream>
-#include <fstream>
-
-#include <curl/curl.h>
-#include <string.h>
-
-#include "writer-base.hh"
-
-using namespace kcov;
-
-class CurlConnectionHandler
-{
-public:
-	CurlConnectionHandler() :
-		m_headerlist(NULL)
-	{
-		static const char buf[] = "Expect:";
-
-		// Workaround proxy problems
-		m_headerlist = curl_slist_append(m_headerlist, buf);
-
-		curl_global_init(CURL_GLOBAL_ALL);
-
-		m_curl = curl_easy_init();
-
-		// Setup curl to read from memory
-		curl_easy_setopt(m_curl, CURLOPT_URL, "https://coveralls.io/api/v1/jobs");
-		curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteFuncStatic);
-		curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, (void *)this);
-		curl_easy_setopt(m_curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
-		curl_easy_setopt(m_curl, CURLOPT_HTTPHEADER, m_headerlist); // Proxy issues
-	}
-
-	~CurlConnectionHandler()
-	{
-		curl_slist_free_all(m_headerlist);
-		curl_easy_cleanup(m_curl);
-		curl_global_cleanup();
-	}
-
-
-	// Send fileName and data to the remote server
-	bool talk(const std::string &fileName)
-	{
-		m_writtenData = "";
-
-		struct curl_httppost *formpost = NULL;
-		struct curl_httppost *lastptr = NULL;
-		CURLcode res;
-
-		curl_formadd(&formpost,
-				&lastptr,
-				CURLFORM_COPYNAME, "json_file",
-				CURLFORM_FILE, fileName.c_str(),
-				CURLFORM_END);
-
-		curl_easy_setopt(m_curl, CURLOPT_HTTPPOST, formpost);
-
-		res = curl_easy_perform(m_curl);
-
-		curl_formfree(formpost);
-
-		if (res != CURLE_OK)
-			return false;
-
-		if (m_writtenData.find("Job #") == std::string::npos)
-		{
-			warning("coveralls write failed: %s\n", m_writtenData.c_str());
-			return false;
-		}
-
-		return true;
-	}
-
-private:
-	size_t curlWritefunc(void *ptr, size_t size, size_t nmemb)
-	{
-		const char *p = (char *)ptr;
-
-		m_writtenData.append(p, size * nmemb);
-
-		return size * nmemb;
-	}
-
-	static size_t curlWriteFuncStatic(void *ptr, size_t size, size_t nmemb, void *priv)
-	{
-		if (!priv)
-			return 0;
-
-		return ((CurlConnectionHandler *)priv)->curlWritefunc(ptr, size, nmemb);
-	}
-
-	CURL *m_curl;
-	std::string m_writtenData;
-	struct curl_slist *m_headerlist;
-};
-
-static CurlConnectionHandler *g_curl;
-
-
-class CoverallsWriter : public WriterBase
-{
-public:
-	CoverallsWriter(IFileParser &parser, IReporter &reporter) :
-		WriterBase(parser, reporter),
-		m_doWrite(false)
-	{
-	}
-
-	void onStartup()
-	{
-	}
-
-	void onStop()
-	{
-		m_doWrite = true;
-	}
-
-	void write()
-	{
-		// Write once at the end only
-		if (!m_doWrite)
-			return;
-
-		IConfiguration &conf = IConfiguration::getInstance();
-		const std::string &id = conf.keyAsString("coveralls-id");
-
-		// No token? Skip output then
-		if (id == "")
-			return;
-
-		std::string outFile = conf.keyAsString("target-directory") + "/coveralls.out";
-
-		// Output file with coveralls json data
-		std::ofstream out(outFile);
-
-		// Output directory not writable?
-		if (!out.is_open())
-			return;
-
-		out << "{\n";
-		if (isRepoToken(id))
-		{
-			out << " \"repo_token\": \"" + id + "\",\n";
-		}
-		else
-		{
-			out << " \"service_name\": \"" + conf.keyAsString("coveralls-service-name") + "\",\n";
-			out << " \"service_job_id\": \"" + id + "\",\n";
-		}
-		out << " \"source_files\": [\n";
-		setupCommonPaths();
-		
-		std::string strip_path = conf.keyAsString("strip-path");
-		if (strip_path.size() == 0)
-		{
-			setupCommonPaths();
-			strip_path = m_commonPath + "/";
-		}
-
-		unsigned int filesLeft = m_files.size();
-		for (FileMap_t::const_iterator it = m_files.begin();
-				it != m_files.end();
-				++it)
-		{
-			File *file = it->second;
-			std::string fileName;
-
-			// Strip away the specified path (unless this is the only file)
-			if (file->m_name.compare(0, strip_path.length(), strip_path) == 0)
-				fileName = file->m_name.substr(strip_path.size());
-			else
-				fileName = file->m_fileName;
-
-			out << "  {\n";
-			out << "   \"name\": \"" + escape_json(fileName) + "\",\n";
-			// Use hash as source file
-			out << fmt("   \"source_digest\": \"0x%08lx\",\n", (unsigned long)file->m_crc);
-			out << "   \"coverage\": [";
-
-			// And coverage
-			for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-			{
-				if (!m_reporter.lineIsCode(file->m_name, n))
-				{
-					out << "null";
-				}
-				else
-				{
-					IReporter::LineExecutionCount cnt =
-							m_reporter.getLineExecutionCount(file->m_name, n);
-
-					out << cnt.m_hits;
-				}
-
-				if (n != file->m_lastLineNr - 1)
-					out << ",";
-			}
-			out << "]\n";
-
-			// Add comma or not on the last run
-			filesLeft--;
-			if (filesLeft > 0)
-				out << "  },\n";
-			else
-				out << "  }\n";
-		}
-		out << " ]\n";
-		out << "}\n";
-
-		out.close();
-
-		// Create singleton
-		if (!g_curl)
-			g_curl = new CurlConnectionHandler();
-
-		if (id != "dry-run")
-			g_curl->talk(outFile);
-	}
-
-private:
-	bool isRepoToken(const std::string &str)
-	{
-		return str.size() >= 32;
-	}
-
-	bool m_doWrite;
-};
-
-namespace kcov
-{
-	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter)
-	{
-		return *new CoverallsWriter(parser, reporter);
-	}
-}
diff --git a/kcov-38/src/writers/coveralls-writer.hh b/kcov-38/src/writers/coveralls-writer.hh
deleted file mode 100644
index 67ef9dca33e4..000000000000
--- a/kcov-38/src/writers/coveralls-writer.hh
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-
-	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter);
-}
diff --git a/kcov-38/src/writers/dummy-coveralls-writer.cc b/kcov-38/src/writers/dummy-coveralls-writer.cc
deleted file mode 100644
index 8c458d36556d..000000000000
--- a/kcov-38/src/writers/dummy-coveralls-writer.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <writer.hh>
-
-#include "writer-base.hh"
-
-class DummyCoverallsWriter : public kcov::IWriter
-{
-public:
-	void onStartup()
-	{
-	}
-
-	void onStop()
-	{
-	}
-
-	void write()
-	{
-	}
-};
-
-namespace kcov
-{
-	IWriter &createCoverallsWriter(IFileParser &parser, IReporter &reporter)
-	{
-		return *new DummyCoverallsWriter();
-	}
-}
diff --git a/kcov-38/src/writers/html-writer.cc b/kcov-38/src/writers/html-writer.cc
deleted file mode 100644
index 56e3d3cab50b..000000000000
--- a/kcov-38/src/writers/html-writer.cc
+++ /dev/null
@@ -1,413 +0,0 @@
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <configuration.hh>
-#include <writer.hh>
-#include <utils.hh>
-#include <generated-data-base.hh>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <string>
-#include <list>
-#include <vector>
-#include <unordered_map>
-#include <fstream>
-
-#include "writer-base.hh"
-
-using namespace kcov;
-
-// Generated
-extern GeneratedData css_text_data;
-extern GeneratedData icon_amber_data;
-extern GeneratedData icon_glass_data;
-extern GeneratedData source_file_text_data;
-extern GeneratedData index_text_data;
-extern GeneratedData handlebars_text_data;
-extern GeneratedData kcov_text_data;
-extern GeneratedData jquery_text_data;
-extern GeneratedData tablesorter_text_data;
-extern GeneratedData tablesorter_widgets_text_data;
-extern GeneratedData tablesorter_theme_text_data;
-
-class HtmlWriter : public WriterBase
-{
-public:
-	HtmlWriter(IFileParser &parser, IReporter &reporter, const std::string &indexDirectory, const std::string &outDirectory,
-			const std::string &name, bool includeInTotals) :
-			WriterBase(parser, reporter), m_outDirectory(outDirectory + "/"), m_indexDirectory(indexDirectory + "/"), m_summaryDbFileName(
-					outDirectory + "/summary.db"), m_name(name), m_includeInTotals(includeInTotals), m_maxPossibleHits(
-					parser.maxPossibleHits())
-	{
-	}
-
-	void onStop()
-	{
-	}
-
-private:
-
-	void writeOne(File *file)
-	{
-		std::string jsonOutName = m_outDirectory + "/" + file->m_jsonOutFileName;
-		std::string htmlOutName = m_outDirectory + "/" + file->m_outFileName;
-		unsigned int nExecutedLines = 0;
-		unsigned int nCodeLines = 0;
-
-		// Out-file for JSON data
-		std::ofstream outJson(jsonOutName);
-		// ... and HTML data
-		std::ofstream outHtml(htmlOutName);
-
-		outJson << "var data = {lines:[\n";
-
-		// Produce each line in the file
-		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-		{
-			const std::string &line = file->m_lineMap[n];
-
-			outJson << fmt("{\"lineNum\":\"%5u\","
-					"\"line\":\"", n);
-			outJson << escape_json(line) << "\"";
-
-			if (m_reporter.lineIsCode(file->m_name, n))
-			{
-				IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
-				std::string lineClass = "lineNoCov";
-
-				if (m_maxPossibleHits == IFileParser::HITS_UNLIMITED || m_maxPossibleHits == IFileParser::HITS_SINGLE)
-				{
-					if (cnt.m_hits)
-						lineClass = "lineCov";
-				}
-				else
-				{ // One or multiple for a line
-					if (cnt.m_hits == cnt.m_possibleHits)
-						lineClass = "lineCov";
-					else if (cnt.m_hits)
-						lineClass = "linePartCov";
-				}
-
-				outJson << fmt(",\"class\":\"%s\","
-						"\"hits\":\"%u\",", lineClass.c_str(), cnt.m_hits);
-
-				// Don't report order for zeroes
-				if (cnt.m_order)
-					outJson << fmt("\"order\":\"%llu\",", (unsigned long long) cnt.m_order);
-
-				if (m_maxPossibleHits != IFileParser::HITS_SINGLE)
-					outJson << fmt("\"possible_hits\":\"%u\",", cnt.m_possibleHits);
-
-				nExecutedLines += !!cnt.m_hits;
-				nCodeLines++;
-			}
-			outJson << "},\n";
-
-			// Update the execution count
-			file->m_executedLines = nExecutedLines;
-			file->m_codeLines = nCodeLines;
-		}
-
-		// Add the header
-		outJson << "]};\n";
-		outJson << getHeader(nCodeLines, nExecutedLines);
-		outJson << "var merged_data = [];\n";
-
-		// Produce HTML out-file
-		outHtml << fmt("<script type=\"text/javascript\" src=\"%s\"></script>\n", file->m_jsonOutFileName.c_str());
-		outHtml.write((const char *) source_file_text_data.data(), source_file_text_data.size());
-	}
-
-	void writeIndex()
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		unsigned int nTotalExecutedLines = 0;
-		unsigned int nTotalCodeLines = 0;
-
-		// Out-file for JSON data
-		std::ofstream outJson(m_outDirectory + "index.js");
-		outJson << "var data = {files:[\n"; // Not really json, but anyway
-
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *file = it->second;
-			unsigned int nExecutedLines = file->m_executedLines;
-			unsigned int nCodeLines = file->m_codeLines;
-
-			nTotalCodeLines += nCodeLines;
-			nTotalExecutedLines += nExecutedLines;
-
-			std::string listName = file->m_name;
-
-			size_t pos = listName.find(m_commonPath);
-			unsigned int stripLevel = IConfiguration::getInstance().keyAsInt("path-strip-level");
-
-			if (pos != std::string::npos && m_commonPath.size() != 0 && stripLevel != ~0U)
-			{
-				std::string pathToRemove = m_commonPath;
-
-				for (unsigned int i = 0; i < stripLevel; i++)
-				{
-					size_t slashPos = pathToRemove.rfind("/");
-
-					if (slashPos == std::string::npos)
-						break;
-					pathToRemove = pathToRemove.substr(0, slashPos);
-				}
-
-				std::string prefix = "[...]";
-
-				if (pathToRemove == "")
-					prefix = "";
-				listName = prefix + listName.substr(pathToRemove.size());
-			}
-
-			outJson << getIndexHeader(file->m_outFileName, file->m_fileName, listName, nCodeLines, nExecutedLines);
-		}
-
-		// Add the header
-		outJson
-				<< fmt("]};\n"
-						"var percent_low = %d;"
-						"var percent_high = %d;"
-						"\n"
-						"var header = {"
-						" \"command\" : \"%s\","
-						" \"date\" : \"%s\","
-						" \"instrumented\" : %d,"
-						" \"covered\" : %d,"
-						"};"
-						"\n", conf.keyAsInt("low-limit"), conf.keyAsInt("high-limit"),
-						escape_json(conf.keyAsString("command-name")).c_str(), getDateNow().c_str(), nTotalCodeLines,
-						nTotalExecutedLines) + "var merged_data = [];\n";
-
-		// Produce HTML outfile
-		std::ofstream outHtml(m_outDirectory + "index.html");
-		outHtml.write((const char *) index_text_data.data(), index_text_data.size());
-
-		// Produce a summary
-		IReporter::ExecutionSummary summary = m_reporter.getExecutionSummary();
-		summary.m_includeInTotals = m_includeInTotals;
-		size_t sz;
-
-		void *data = marshalSummary(summary, m_name, &sz);
-
-		if (data)
-			write_file(data, sz, "%s", m_summaryDbFileName.c_str());
-
-		free(data);
-	}
-
-	void writeGlobalIndex()
-	{
-		DIR *dir;
-		struct dirent *de;
-		std::string idx = m_indexDirectory.c_str();
-		std::string s;
-		unsigned int nTotalExecutedLines = 0;
-		unsigned int nTotalCodeLines = 0;
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		dir = opendir(idx.c_str());
-		panic_if(!dir, "Can't open directory %s\n", idx.c_str());
-
-		std::ofstream outJson(m_indexDirectory + "index.js");
-
-		outJson << "var data = {files:[\n";
-		std::string merged;
-
-		for (de = readdir(dir); de; de = readdir(dir))
-		{
-			std::string curDir = idx + de->d_name;
-			std::string cur = curDir + "/summary.db";
-			struct stat st;
-
-			if (lstat(curDir.c_str(), &st) < 0)
-			{
-				continue;
-			}
-
-			if (S_ISLNK(st.st_mode))
-			{
-				// Skip human friendly names
-				continue;
-			}
-
-			if (!file_exists(cur))
-				continue;
-
-			size_t sz;
-			void *data = read_file(&sz, "%s", cur.c_str());
-
-			if (!data)
-				continue;
-
-			IReporter::ExecutionSummary summary;
-			std::string name;
-			bool res = unMarshalSummary(data, sz, summary, name);
-			free(data);
-
-			if (!res)
-				continue;
-
-			// Skip entries (merged ones) that shouldn't be included in the totals
-			if (summary.m_includeInTotals)
-			{
-				nTotalCodeLines += summary.m_lines;
-				nTotalExecutedLines += summary.m_executedLines;
-			}
-
-			std::string datum = getIndexHeader(fmt("%s/index.html", de->d_name), name, name, summary.m_lines,
-					summary.m_executedLines);
-
-			if (name == conf.keyAsString("merged-name"))
-				merged += datum;
-			else
-				outJson << datum;
-		}
-
-		// Add the header
-		outJson << "], merged_files:[" + merged + "]};\n" + getHeader(nTotalCodeLines, nTotalExecutedLines);
-
-		// Produce HTML outfile
-		std::ofstream outHtml(m_indexDirectory + "index.html");
-		outHtml.write((const char *) index_text_data.data(), index_text_data.size());
-
-		closedir(dir);
-	}
-
-	void write()
-	{
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-			writeOne(it->second);
-
-		setupCommonPaths();
-
-		writeIndex();
-
-		if (m_includeInTotals)
-			writeGlobalIndex();
-	}
-
-	std::string getHeader(unsigned int lines, unsigned int executedLines)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		return fmt("var percent_low = %d;"
-				"var percent_high = %d;"
-				"\n"
-				"var header = {"
-				" \"command\" : \"%s\","
-				" \"date\" : \"%s\","
-				" \"instrumented\" : %d,"
-				" \"covered\" : %d,"
-				"};"
-				"\n", conf.keyAsInt("low-limit"), conf.keyAsInt("high-limit"),
-				escape_json(conf.keyAsString("command-name")).c_str(), getDateNow().c_str(), lines, executedLines);
-	}
-
-	// Return a header for index-type JSON files
-	std::string getIndexHeader(const std::string &linkName, const std::string titleName, const std::string summaryName,
-			unsigned int lines, unsigned int executedLines)
-	{
-		double percent = 0;
-
-		if (lines != 0)
-			percent = (executedLines / (double) lines) * 100;
-
-		return fmt("{\"link\":\"%s\","
-				"\"title\":\"%s\","
-				"\"summary_name\":\"%s\","
-				"\"covered_class\":\"%s\","
-				"\"covered\":\"%.1f\","
-				"\"covered_lines\":\"%d\","
-				"\"uncovered_lines\":\"%d\","
-				"\"total_lines\" : \"%d\"},\n", linkName.c_str(), titleName.c_str(), summaryName.c_str(),
-				colorFromPercent(percent).c_str(), percent, executedLines, lines - executedLines, lines);
-	}
-
-	std::string colorFromPercent(double percent)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-
-		if (percent >= conf.keyAsInt("high-limit"))
-			return "lineCov";
-		else if (percent > conf.keyAsInt("low-limit"))
-			return "linePartCov";
-
-		return "lineNoCov";
-	}
-
-	std::string getDateNow()
-	{
-		time_t t;
-		struct tm *tm;
-		char date_buf[128];
-
-		t = time(NULL);
-		tm = localtime(&t);
-		strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", tm);
-
-		return std::string(date_buf);
-	}
-
-	void writeHelperFiles(std::string dir)
-	{
-		IConfiguration &conf = IConfiguration::getInstance();
-		GeneratedData css = css_text_data;
-
-		std::string cssFileName = conf.keyAsString("css-file");
-		if (cssFileName != "")
-		{
-			size_t sz;
-			uint8_t *p = (uint8_t *) read_file(&sz, "%s", cssFileName.c_str());
-
-			if (p)
-				css = GeneratedData(p, sz);
-			else
-				warning("Can't read CSS file %s\n", cssFileName.c_str());
-		}
-
-		write_file(icon_amber_data.data(), icon_amber_data.size(), "%s/amber.png", dir.c_str());
-		write_file(icon_glass_data.data(), icon_glass_data.size(), "%s/glass.png", dir.c_str());
-		write_file(css.data(), css.size(), "%s/bcov.css", dir.c_str());
-
-		(void) mkdir(fmt("%s/data", dir.c_str()).c_str(), 0755);
-		(void) mkdir(fmt("%s/data/js", dir.c_str()).c_str(), 0755);
-		write_file(icon_amber_data.data(), icon_amber_data.size(), "%s/data/amber.png", dir.c_str());
-		write_file(icon_glass_data.data(), icon_glass_data.size(), "%s/data/glass.png", dir.c_str());
-		write_file(css.data(), css.size(), "%s/data/bcov.css", dir.c_str());
-		write_file(handlebars_text_data.data(), handlebars_text_data.size(), "%s/data/js/handlebars.js", dir.c_str());
-		write_file(kcov_text_data.data(), kcov_text_data.size(), "%s/data/js/kcov.js", dir.c_str());
-		write_file(jquery_text_data.data(), jquery_text_data.size(), "%s/data/js/jquery.min.js", dir.c_str());
-		write_file(tablesorter_text_data.data(), tablesorter_text_data.size(), "%s/data/js/tablesorter.min.js", dir.c_str());
-		write_file(tablesorter_widgets_text_data.data(), tablesorter_widgets_text_data.size(),
-				"%s/data/js/jquery.tablesorter.widgets.min.js", dir.c_str());
-		write_file(tablesorter_theme_text_data.data(), tablesorter_theme_text_data.size(), "%s/data/tablesorter-theme.css",
-				dir.c_str());
-	}
-
-	void onStartup()
-	{
-		writeHelperFiles(m_indexDirectory);
-		writeHelperFiles(m_outDirectory);
-	}
-
-	std::string m_outDirectory;
-	std::string m_indexDirectory;
-	std::string m_summaryDbFileName;
-	std::string m_name;
-	bool m_includeInTotals;
-	enum IFileParser::PossibleHits m_maxPossibleHits;
-};
-
-namespace kcov
-{
-	IWriter &createHtmlWriter(IFileParser &parser, IReporter &reporter, const std::string &indexDirectory,
-			const std::string &outDirectory, const std::string &name, bool includeInTotals)
-	{
-		return *new HtmlWriter(parser, reporter, indexDirectory, outDirectory, name, includeInTotals);
-	}
-}
diff --git a/kcov-38/src/writers/html-writer.hh b/kcov-38/src/writers/html-writer.hh
deleted file mode 100644
index 69b546bb1e4d..000000000000
--- a/kcov-38/src/writers/html-writer.hh
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-	class IOutputHandler;
-
-	IWriter &createHtmlWriter(IFileParser &elf, IReporter &reporter,
-			const std::string &indexDirectory,
-			const std::string &outDirectory,
-			const std::string &name,
-			bool includeInTotals = true);
-}
diff --git a/kcov-38/src/writers/json-writer.cc b/kcov-38/src/writers/json-writer.cc
deleted file mode 100644
index d0d124d4120f..000000000000
--- a/kcov-38/src/writers/json-writer.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-namespace std
-{
-class type_info;
-}
-
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <configuration.hh>
-#include <writer.hh>
-#include <utils.hh>
-
-#include <string>
-#include <list>
-#include <unordered_map>
-#include <iostream>
-#include <fstream>
-
-#include "writer-base.hh"
-
-using namespace kcov;
-
-class JsonWriter : public WriterBase
-{
-public:
-	JsonWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile) :
-			WriterBase(parser, reporter), m_outFile(outFile)
-	{
-	}
-
-	void onStartup()
-	{
-	}
-
-	void onStop()
-	{
-	}
-
-	void write()
-	{
-		std::ofstream out(m_outFile);
-
-		// Output directory not writable?
-		if (!out.is_open())
-			return;
-
-		out << "{\n";
-		out << "  \"files\": [\n";
-
-		IConfiguration &conf = IConfiguration::getInstance();
-		unsigned int nTotalExecutedLines = 0;
-		unsigned int nTotalCodeLines = 0;
-		double percentCovered = 0.0;
-		bool firstFile = true;
-
-		for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-		{
-			File *file = it->second;
-			unsigned int nExecutedLines = 0;
-			unsigned int nCodeLines = 0;
-
-			for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-			{
-				IReporter::LineExecutionCount cnt = m_reporter.getLineExecutionCount(file->m_name, n);
-				if (m_reporter.lineIsCode(file->m_name, n))
-				{
-					nExecutedLines += !!cnt.m_hits;
-					nCodeLines++;
-					nTotalExecutedLines += !!cnt.m_hits;
-					nTotalCodeLines++;
-				}
-			}
-			if (nCodeLines > 0)
-				percentCovered = static_cast<double>(nExecutedLines) / nCodeLines * 100;
-
-			if (firstFile)
-				firstFile = false;
-			else
-				out << ",\n";
-
-			out << fmt("    {"
-					"\"file\": \"%s\", "
-					"\"percent_covered\": \"%.2f\", "
-					"\"covered_lines\": \"%d\", "
-					"\"total_lines\": \"%d\""
-					"}", file->m_name.c_str(), percentCovered, nExecutedLines, nCodeLines);
-		}
-
-		percentCovered = 0;
-		if (nTotalCodeLines > 0)
-			percentCovered = static_cast<double>(nTotalExecutedLines) / nTotalCodeLines * 100;
-
-		out
-				<< fmt("\n"
-						"  ],\n"
-						"  \"percent_covered\": \"%.2f\",\n"
-						"  \"covered_lines\": %d,\n"
-						"  \"total_lines\": %d,\n"
-						"  \"percent_low\": %d,\n"
-						"  \"percent_high\": %d,\n"
-						"  \"command\": \"%s\",\n"
-						"  \"date\": \"%s\"\n"
-						"}\n", percentCovered, nTotalExecutedLines, nTotalCodeLines, conf.keyAsInt("low-limit"),
-						conf.keyAsInt("high-limit"), escape_json(conf.keyAsString("command-name")).c_str(),
-						getDateNow().c_str());
-
-	}
-
-private:
-	std::string getDateNow()
-	{
-		time_t t;
-		struct tm *tm;
-		char date_buf[128];
-
-		t = time(NULL);
-		tm = localtime(&t);
-		strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", tm);
-
-		return std::string(date_buf);
-	}
-
-	std::string m_outFile;
-};
-
-namespace kcov
-{
-	IWriter &createJsonWriter(IFileParser &parser, IReporter &reporter, const std::string &outFile)
-	{
-		return *new JsonWriter(parser, reporter, outFile);
-	}
-}
diff --git a/kcov-38/src/writers/json-writer.hh b/kcov-38/src/writers/json-writer.hh
deleted file mode 100644
index 889081cb1a7e..000000000000
--- a/kcov-38/src/writers/json-writer.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-	class IOutputHandler;
-
-	IWriter &createJsonWriter(IFileParser &elf, IReporter &reporter,
-			const std::string &outFile);
-}
diff --git a/kcov-38/src/writers/sonarqube-xml-writer.cc b/kcov-38/src/writers/sonarqube-xml-writer.cc
deleted file mode 100644
index 7b34233bcdd3..000000000000
--- a/kcov-38/src/writers/sonarqube-xml-writer.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-namespace std { class type_info; }
-
-#include <reporter.hh>
-#include <file-parser.hh>
-#include <configuration.hh>
-#include <writer.hh>
-#include <utils.hh>
-
-#include <string>
-#include <list>
-#include <unordered_map>
-#include <iostream>
-#include <fstream>
-
-#include "writer-base.hh"
-#include "sonarqube-xml-writer.hh"
-
-using namespace kcov;
-
-class SonarQubeWriter : public WriterBase
-{
-public:
-	SonarQubeWriter(IFileParser &parser, IReporter &reporter,
-			const std::string &outFile) :
-		WriterBase(parser, reporter),
-		m_outFile(outFile),
-		m_maxPossibleHits(parser.maxPossibleHits())
-	{
-	}
-
-	void onStartup()
-	{
-	}
-
-	void onStop()
-	{
-	}
-
-	void write()
-	{
-		std::ofstream out(m_outFile);
-
-		// Output directory not writable?
-		if (!out.is_open())
-			return;
-
-		setupCommonPaths();
-
-		out << "<!-- Generated by kcov (https://simonkagstrom.github.io/kcov/) -->\n";
-		out << "<coverage version=\"1\">\n";
-
-		for (FileMap_t::const_iterator it = m_files.begin();
-				it != m_files.end();
-				++it) {
-			File *file = it->second;
-
-			writeOne(file, out);
-		}
-
-		out << "</coverage>\n";
-	}
-
-private:
-	void writeOne(File *file, std::ofstream &out)
-	{
-		out << fmt("	<file path=\"%s\">\n", file->m_name.c_str());
-
-		for (unsigned int n = 1; n < file->m_lastLineNr; n++)
-		{
-			if (!m_reporter.lineIsCode(file->m_name, n))
-					continue;
-
-			IReporter::LineExecutionCount cnt =
-					m_reporter.getLineExecutionCount(file->m_name, n);
-
-			std::string covered = cnt.m_hits ? "true" : "false";
-
-			out << fmt("		<lineToCover lineNumber=\"%d\" covered=\"%s\"/>\n", n, covered.c_str());
-		}
-
-		out << "	</file>\n";
-	}
-
-	std::string getHeader(unsigned int nCodeLines, unsigned int nExecutedLines)
-	{
-		return "<?xml version=\"1.0\" ?>\n";
-	}
-
-	const std::string getFooter()
-	{
-		return "";
-	}
-
-
-	std::string m_outFile;
-	IFileParser::PossibleHits m_maxPossibleHits;
-};
-
-namespace kcov
-{
-	IWriter &createSonarqubeWriter(IFileParser &parser, IReporter &reporter,
-			const std::string &outFile)
-	{
-		return *new SonarQubeWriter(parser, reporter, outFile);
-	}
-}
diff --git a/kcov-38/src/writers/sonarqube-xml-writer.hh b/kcov-38/src/writers/sonarqube-xml-writer.hh
deleted file mode 100644
index c55d5982ed03..000000000000
--- a/kcov-38/src/writers/sonarqube-xml-writer.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-	class IOutputHandler;
-
-	IWriter &createSonarqubeWriter(IFileParser &elf, IReporter &reporter,
-			const std::string &outFile);
-}
diff --git a/kcov-38/src/writers/writer-base.cc b/kcov-38/src/writers/writer-base.cc
deleted file mode 100644
index 0986e28ce111..000000000000
--- a/kcov-38/src/writers/writer-base.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-#define _WITH_GETLINE	// Needed on FreeBSD < 12.0
-#include "writer-base.hh"
-#include <utils.hh>
-
-#include <swap-endian.hh>
-
-#include <stdio.h>
-
-using namespace kcov;
-
-#define SUMMARY_MAGIC   0x456d696c
-#define SUMMARY_VERSION 2
-
-struct summaryStruct
-{
-	uint32_t magic;
-	uint32_t version;
-	uint32_t includeInTotals;
-	uint32_t nLines;
-	uint32_t nExecutedLines;
-	char name[256];
-};
-
-WriterBase::WriterBase(IFileParser &parser, IReporter &reporter) :
-		m_fileParser(parser), m_reporter(reporter), m_commonPath("not set")
-{
-	m_fileParser.registerLineListener(*this);
-}
-
-WriterBase::~WriterBase()
-{
-	for (FileMap_t::iterator it = m_files.begin(); it != m_files.end(); ++it)
-	{
-		File *cur = it->second;
-
-		delete cur;
-	}
-
-	m_files.clear();
-}
-
-WriterBase::File::File(const std::string &filename) :
-		m_name(filename), m_codeLines(0), m_executedLines(0), m_lastLineNr(0)
-{
-	size_t pos = m_name.rfind('/');
-
-	if (pos != std::string::npos)
-		m_fileName = m_name.substr(pos + 1, std::string::npos);
-	else
-		m_fileName = m_name;
-
-	// Make this name unique (we might have several files with the same name)
-	m_crc = hash_block(filename.c_str(), filename.size());
-	readFile(filename);
-
-	m_outFileName = fmt("%s.%x.html", m_fileName.c_str(), m_crc);
-	m_jsonOutFileName = fmt("%s.%x.js", m_fileName.c_str(), m_crc);
-}
-
-void WriterBase::File::readFile(const std::string &filename)
-{
-	FILE *fp = fopen(filename.c_str(), "r");
-	unsigned int lineNr = 1;
-
-	panic_if(!fp, "Can't open %s", filename.c_str());
-
-	while (1)
-	{
-		char *lineptr = NULL;
-		ssize_t res;
-		size_t n;
-
-		res = getline(&lineptr, &n, fp);
-		if (res < 0)
-			break;
-		std::string s(lineptr);
-		s.erase(s.find_last_not_of(" \n\r\t") + 1);
-		m_lineMap[lineNr] = s;
-
-		free((void *) lineptr);
-		lineNr++;
-	}
-
-	m_lastLineNr = lineNr;
-
-	fclose(fp);
-}
-
-void WriterBase::onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-{
-	if (!m_reporter.fileIsIncluded(file))
-		return;
-
-	if (m_files.find(file) != m_files.end())
-		return;
-
-	if (!file_exists(file))
-		return;
-
-	m_files[file] = new File(file);
-}
-
-void *WriterBase::marshalSummary(IReporter::ExecutionSummary &summary, const std::string &name, size_t *sz)
-{
-	struct summaryStruct *p;
-
-	p = (struct summaryStruct *) xmalloc(sizeof(struct summaryStruct));
-	memset(p, 0, sizeof(*p));
-
-	p->magic = to_be<uint32_t>(SUMMARY_MAGIC);
-	p->version = to_be<uint32_t>(SUMMARY_VERSION);
-	p->includeInTotals = to_be<uint32_t>(summary.m_includeInTotals);
-	p->nLines = to_be<uint32_t>(summary.m_lines);
-	p->nExecutedLines = to_be<uint32_t>(summary.m_executedLines);
-	strncpy(p->name, name.c_str(), sizeof(p->name) - 1);
-
-	*sz = sizeof(*p);
-
-	return (void *) p;
-}
-
-bool WriterBase::unMarshalSummary(void *data, size_t sz, IReporter::ExecutionSummary &summary, std::string &name)
-{
-	struct summaryStruct *p = (struct summaryStruct *) data;
-
-	if (sz != sizeof(*p))
-		return false;
-
-	if (be_to_host<uint32_t>(p->magic) != SUMMARY_MAGIC)
-		return false;
-
-	if (be_to_host<uint32_t>(p->version) != SUMMARY_VERSION)
-		return false;
-
-	summary.m_lines = be_to_host<uint32_t>(p->nLines);
-	summary.m_executedLines = be_to_host<uint32_t>(p->nExecutedLines);
-	summary.m_includeInTotals = be_to_host<uint32_t>(p->includeInTotals);
-	name = std::string(p->name);
-
-	return true;
-}
-
-void WriterBase::setupCommonPaths()
-{
-	for (FileMap_t::const_iterator it = m_files.begin(); it != m_files.end(); ++it)
-	{
-		File *file = it->second;
-
-		if (m_commonPath == "not set")
-			m_commonPath = file->m_name;
-
-		/* Already matching? */
-		if (file->m_name.find(m_commonPath) == 0)
-			continue;
-
-		while (1)
-		{
-			size_t pos = m_commonPath.rfind('/');
-			if (pos == std::string::npos)
-				break;
-
-			m_commonPath = m_commonPath.substr(0, pos);
-			if (file->m_name.find(m_commonPath) == 0)
-				break;
-		}
-	}
-}
diff --git a/kcov-38/src/writers/writer-base.hh b/kcov-38/src/writers/writer-base.hh
deleted file mode 100644
index cf4b79ab27b8..000000000000
--- a/kcov-38/src/writers/writer-base.hh
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include <writer.hh>
-#include <reporter.hh>
-#include <file-parser.hh>
-
-#include <string>
-#include <unordered_map>
-
-namespace kcov
-{
-	class IFileParser;
-	class IReporter;
-
-	class WriterBase : public IFileParser::ILineListener, public IWriter
-	{
-	protected:
-		WriterBase(IFileParser &elf, IReporter &reporter);
-
-		~WriterBase();
-
-		class File
-		{
-		public:
-			typedef std::unordered_map<unsigned int, std::string> LineMap_t;
-
-			File(const std::string &filename);
-
-			std::string m_name;
-			std::string m_fileName;
-			std::string m_outFileName;
-			std::string m_jsonOutFileName;
-			uint32_t m_crc;
-			LineMap_t m_lineMap;
-			unsigned int m_codeLines;
-			unsigned int m_executedLines;
-			unsigned int m_lastLineNr;
-
-		private:
-			void readFile(const std::string &filename);
-		};
-
-		typedef std::unordered_map<std::string, File *> FileMap_t;
-
-
-		/* Called when the ELF is parsed */
-		void onLine(const std::string &file, unsigned int lineNr, uint64_t addr);
-
-
-		void *marshalSummary(IReporter::ExecutionSummary &summary,
-				const std::string &name, size_t *sz);
-
-		bool unMarshalSummary(void *data, size_t sz,
-				IReporter::ExecutionSummary &summary,
-				std::string &name);
-
-		void setupCommonPaths();
-
-		IFileParser &m_fileParser;
-		IReporter &m_reporter;
-		FileMap_t m_files;
-		std::string m_commonPath;
-	};
-}
diff --git a/kcov-38/tests/CMakeLists.txt b/kcov-38/tests/CMakeLists.txt
deleted file mode 100644
index d79a4c5c7016..000000000000
--- a/kcov-38/tests/CMakeLists.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-cmake_minimum_required (VERSION 2.8.4)
-project (kcov-tests)
-
-enable_language(ASM)
-
-if (POLICY CMP0042)
-    # MACOSX_RPATH is enabled by default.
-    cmake_policy (SET CMP0042 NEW)
-endif (POLICY CMP0042)
-
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set (CMAKE_BUILD_TYPE Debug CACHE STRING
-        "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
-        FORCE
-    )
-    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
-        STRINGS None Debug Release RelWithDebInfo MinSizeRel
-    )
-endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
-set (CMAKE_THREAD_PREFER_PTHREAD ON)
-find_package (Threads REQUIRED)
-
-find_package (ZLIB REQUIRED)
-
-if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-set (DL_LIBRARY "")
-else (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-find_library (DL_LIBRARY NAMES dl)
-if (DL_LIBRARY)
-    message (STATUS "Found DL: ${DL_LIBRARY}")
-else (DL_LIBRARY)
-    message (FATAL_ERROR "Could NOT find DL")
-endif (DL_LIBRARY)
-endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-
-find_library (M_LIBRARY NAMES m)
-if (M_LIBRARY)
-    message (STATUS "Found M: ${M_LIBRARY}")
-else (M_LIBRARY)
-    message (FATAL_ERROR "Could NOT find M")
-endif (M_LIBRARY)
-
-include_directories(
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ../src/include
-)
-set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX}")
-
-add_custom_command (OUTPUT multi-fork-generated.c
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/generate-functions.py"
-            "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/code-template.c"
-            1024
-        > "${CMAKE_CURRENT_BINARY_DIR}/multi-fork-generated.c"
-    DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/multi-fork/generate-functions.py"
-)
-
-add_custom_target(multi-fork-generated ALL
-    DEPENDS multi-fork-generated.c
-)
-set_property(SOURCE multi-fork/test-multi-fork.c APPEND PROPERTY
-    OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/multi-fork-generated.c"
-)
-
-
-set (main_tests_SRCS
-    main.cc
-    subdir/file.c
-    subdir2/file2.c
-)
-
-set (argv_dependent_SRCS
-    argv-dependent.c
-)
-
-set (fork_SRCS
-    fork/fork.c
-)
-
-set (fork_no_wait_SRCS
-    fork/fork-no-wait.c
-)
-
-set (signals_SRCS
-    signals/test-signals.c
-)
-
-set (multi_fork_SRCS
-    multi-fork/test-multi-fork.c
-)
-
-set (recursive-ptrace_SRCS
-    recursive-ptrace/main.cc
-)
-
-set (shared_library_test_SRCS
-    shared-library/main.c
-)
-
-set (test_popen_SRCS
-    popen/test-popen.c
-)
-
-set (global_constructors_SRCS
-    global-constructors/test-global-ctors.cc
-)
-
-set (daemon_SRCS
-    daemon/test-daemon.cc
-)
-
-add_library(shared_library SHARED
-    shared-library/big-symbol.S
-    shared-library/solib.c
-)
-
-add_executable(main-tests ${main_tests_SRCS})
-add_executable(fork ${fork_SRCS})
-add_executable(fork_no_wait ${fork_no_wait_SRCS})
-add_executable(vfork fork/vfork.c)
-add_executable(signals ${signals_SRCS})
-
-add_executable(multi_fork ${multi_fork_SRCS})
-target_link_libraries(multi_fork "${M_LIBRARY}")
-
-add_executable(shared_library_test ${shared_library_test_SRCS})
-target_link_libraries(shared_library_test shared_library)
-
-add_executable(argv_dependent ${argv_dependent_SRCS})
-add_executable(test_popen ${test_popen_SRCS})
-
-add_executable(global-constructors ${global_constructors_SRCS})
-target_link_libraries(global-constructors shared_library)
-
-add_executable(test_daemon ${daemon_SRCS})
-add_executable(multi_1 merge-tests/file.c merge-tests/main_1.c)
-add_executable(multi_2 merge-tests/file.c merge-tests/main_2.c)
-
-add_executable(setpgid-kill setpgid-kill/setpgid-kill-main.cc ../src/utils.cc)
-target_link_libraries(setpgid-kill ${ZLIB_LIBRARIES})
-
-add_executable(issue31 daemon/test-issue31.cc)
-target_link_libraries(issue31 ${CMAKE_THREAD_LIBS_INIT})
-
-add_executable(dlopen dlopen/dlopen.cc dlopen/dlopen-main.cc)
-target_link_libraries(dlopen "${DL_LIBRARY}")
-
-add_executable(s short-file.c)
-add_executable(fork+exec fork/fork+exec.c)
-
-add_executable(thread-test threads/thread-main.c)
-target_link_libraries(thread-test ${CMAKE_THREAD_LIBS_INIT})
-
-#if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-#    add_executable(sanitizer-coverage sanitizer-coverage.c)
-#    set_target_properties(sanitizer-coverage PROPERTIES COMPILE_FLAGS "-g -fsanitize=address -fsanitize-coverage=bb")
-#    set_target_properties(sanitizer-coverage PROPERTIES LINK_FLAGS "-fsanitize=address -fsanitize-coverage=bb")
-#endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-
-add_executable (pie pie.c)
-if (CMAKE_VERSION VERSION_LESS "2.8.9")
-    set_target_properties (pie PROPERTIES COMPILE_FLAGS -fPIE)
-else (CMAKE_VERSION VERSION_LESS "2.8.9")
-    set_target_properties (pie PROPERTIES POSITION_INDEPENDENT_CODE ON)
-endif (CMAKE_VERSION VERSION_LESS "2.8.9")
-
-add_executable (pie-test argv-dependent.c)
-if (CMAKE_VERSION VERSION_LESS "2.8.9")
-    set_target_properties (pie-test PROPERTIES COMPILE_FLAGS -fPIE)
-else (CMAKE_VERSION VERSION_LESS "2.8.9")
-    set_target_properties (pie-test PROPERTIES POSITION_INDEPENDENT_CODE ON)
-endif (CMAKE_VERSION VERSION_LESS "2.8.9")
-
-if (NOT(CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-    add_executable(recursive-ptrace ${recursive-ptrace_SRCS})
-    add_custom_target (illegal-insn ALL
-        COMMAND "${CMAKE_C_COMPILER}"
-            -nostdlib
-            "${CMAKE_CURRENT_SOURCE_DIR}/assembly/illegal-insn.S"
-            -o "${CMAKE_CURRENT_BINARY_DIR}/illegal-insn"
-    )
-
-    add_custom_target (fork-32 ALL
-        COMMAND "${CMAKE_C_COMPILER}" -g -m32
-            "${CMAKE_CURRENT_SOURCE_DIR}/fork/fork.c"
-            -o "${CMAKE_CURRENT_BINARY_DIR}/fork-32"
-    )
-endif (NOT(CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-
-add_custom_target(tests-stripped ALL
-    COMMAND "${CMAKE_STRIP}" -o tests-stripped main-tests
-    DEPENDS main-tests)
diff --git a/kcov-38/tests/argv-dependent.c b/kcov-38/tests/argv-dependent.c
deleted file mode 100644
index c68acea7fd8b..000000000000
--- a/kcov-38/tests/argv-dependent.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-static int first(int a)
-{
-	printf("first\n");
-	return a + 1;
-}
-
-static int second(int a)
-{
-	printf("second\n");
-	return a + 2;
-}
-
-int main(int argc, const char *argv[])
-{
-	if (argc == 1)
-		first(argc);
-	else
-		second(argc);
-
-	return 0;
-}
diff --git a/kcov-38/tests/assembly/illegal-insn.S b/kcov-38/tests/assembly/illegal-insn.S
deleted file mode 100644
index 2acff9ace224..000000000000
--- a/kcov-38/tests/assembly/illegal-insn.S
+++ /dev/null
@@ -1,4 +0,0 @@
-.globl _start
-_start:
-	.byte 0xff, 0xff
-	ret
diff --git a/kcov-38/tests/bash/dollar-one-question.sh b/kcov-38/tests/bash/dollar-one-question.sh
deleted file mode 100755
index 1903e5a5202d..000000000000
--- a/kcov-38/tests/bash/dollar-one-question.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#echo before
-fparam=${1:?}
-echo $fparam
diff --git a/kcov-38/tests/bash/dollar-var-replacements.sh b/kcov-38/tests/bash/dollar-var-replacements.sh
deleted file mode 100755
index c0aabba491da..000000000000
--- a/kcov-38/tests/bash/dollar-var-replacements.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#/bin/sh
-fname='.A'
-echo ${fname}
-fname="${fname#.}"
-echo ${fname}
diff --git a/kcov-38/tests/bash/first-dir/a.sh b/kcov-38/tests/bash/first-dir/a.sh
deleted file mode 100644
index d38f21b43f59..000000000000
--- a/kcov-38/tests/bash/first-dir/a.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo A first
-
-if [ "$1" = "hej" ] ; then
-	source `dirname $0`/c.sh
-fi
-
-source `dirname $0`/b.sh
-
diff --git a/kcov-38/tests/bash/first-dir/b.sh b/kcov-38/tests/bash/first-dir/b.sh
deleted file mode 100644
index e566b28a99e1..000000000000
--- a/kcov-38/tests/bash/first-dir/b.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo hejsan
diff --git a/kcov-38/tests/bash/first-dir/c.sh b/kcov-38/tests/bash/first-dir/c.sh
deleted file mode 100644
index 633ead4a9e21..000000000000
--- a/kcov-38/tests/bash/first-dir/c.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo C now
-
diff --git a/kcov-38/tests/bash/function-with-spaces.sh b/kcov-38/tests/bash/function-with-spaces.sh
deleted file mode 100755
index 8242086dd992..000000000000
--- a/kcov-38/tests/bash/function-with-spaces.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#!/bin/sh
-#function-with-spaces.sh
-
-fun1() {
-    echo "hello"
-}
-
-fun2 ()
-{
-    echo "world"
-}
-
-#
-# Main
-#
-
-fun1
-fun2
diff --git a/kcov-38/tests/bash/handle-all-output.sh b/kcov-38/tests/bash/handle-all-output.sh
deleted file mode 100755
index 2376325ea535..000000000000
--- a/kcov-38/tests/bash/handle-all-output.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env bash
-
-for ((i=0; i != 1000; ++i)); do
-  echo "$i"
-done
diff --git a/kcov-38/tests/bash/multiline-alias.sh b/kcov-38/tests/bash/multiline-alias.sh
deleted file mode 100755
index 4b9aa936bbc3..000000000000
--- a/kcov-38/tests/bash/multiline-alias.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-shopt -s expand_aliases
-alias test_alias='{
-echo called test_alias
-} '
-test_alias
diff --git a/kcov-38/tests/bash/multiline-backslash.sh b/kcov-38/tests/bash/multiline-backslash.sh
deleted file mode 100755
index f0950b9c69fb..000000000000
--- a/kcov-38/tests/bash/multiline-backslash.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-USAGE="usage: ${toolName} [--help] [--option1] \\
-       [--option1|--option3] \\
-       function_name [function_options] ...
-"
diff --git a/kcov-38/tests/bash/no-executed-statements.sh b/kcov-38/tests/bash/no-executed-statements.sh
deleted file mode 100755
index 1ff461fbc04c..000000000000
--- a/kcov-38/tests/bash/no-executed-statements.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-some_test()
-{
-    test "${1}" == "--quiet" &&
-        { quiet=${1} ; shift ; }
-}
diff --git a/kcov-38/tests/bash/other.sh b/kcov-38/tests/bash/other.sh
deleted file mode 100644
index f9a6ba7ca845..000000000000
--- a/kcov-38/tests/bash/other.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-echo "This is another shell script"
-
-if [ $1 -eq 5 ] ; then
-	echo "Kalle anka"
-fi
-
-for var in "$@" ; do
-	echo $var
-done
-
-round=0
-for (( ; ; )) do
-	round=$(($round + 1))
-	if [ $round -gt 10 ] ; then
-		break
-	fi
-	echo "hej $round"
-done
-
-echo "Not covered"  # LCOV_EXCL_LINE
-echo "Covered"
-
-# Ranges
-echo "Not covered"  # LCOV_EXCL_START
-echo "Also not covered"
-echo "Also not covered?" # LCOV_EXCL_STOP
-echo "Covered"
-
-# Stacked ranges
-echo "Not covered"  # LCOV_EXCL_START
-echo "Not covered"  # LCOV_EXCL_START
-echo "Also not covered"
-echo "Also not covered?" # LCOV_EXCL_STOP
-echo "Also not covered?" # LCOV_EXCL_STOP
-echo "Covered"
-
-# Unbalanced
-echo "Not covered"  # LCOV_EXCL_START
-echo "Also not covered"
-echo "Also not covered?" # LCOV_EXCL_STOP
-echo "Also not covered?" # LCOV_EXCL_STOP second one
-echo "Covered"
-
-# Custom range CUSTOM_RANGE_START
-echo "Not covered"
-echo "Also not covered"
-echo "Also not covered?"
-# CUSTOM_RANGE_END
-echo "Covered"
-
-# Rust stuff
-echo "Not covered"  # #[should_panic]
-echo "Maybe covered"  # unreachable!
diff --git a/kcov-38/tests/bash/redirect-stderr.sh b/kcov-38/tests/bash/redirect-stderr.sh
deleted file mode 100755
index 0bfb2a7208d9..000000000000
--- a/kcov-38/tests/bash/redirect-stderr.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-test -n "$FILE" && redirect="> ${FILE}"
-eval echo stuff  2>&1 ${redirect:-}
diff --git a/kcov-38/tests/bash/second-dir/a.sh b/kcov-38/tests/bash/second-dir/a.sh
deleted file mode 100644
index 9282ab9102eb..000000000000
--- a/kcov-38/tests/bash/second-dir/a.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo A second
-
-if [ $1 = "hej" ] ; then
-	source `dirname $0`/c.sh
-fi
-
-source `dirname $0`/b.sh
-
diff --git a/kcov-38/tests/bash/second-dir/b.sh b/kcov-38/tests/bash/second-dir/b.sh
deleted file mode 100644
index e566b28a99e1..000000000000
--- a/kcov-38/tests/bash/second-dir/b.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo hejsan
diff --git a/kcov-38/tests/bash/second-dir/c.sh b/kcov-38/tests/bash/second-dir/c.sh
deleted file mode 100644
index 633ead4a9e21..000000000000
--- a/kcov-38/tests/bash/second-dir/c.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo C now
-
diff --git a/kcov-38/tests/bash/sh-shebang.sh b/kcov-38/tests/bash/sh-shebang.sh
deleted file mode 100755
index e6ec725e9842..000000000000
--- a/kcov-38/tests/bash/sh-shebang.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# This do not shows up in coverage report
-echo "foo from sh"
diff --git a/kcov-38/tests/bash/shell-main b/kcov-38/tests/bash/shell-main
deleted file mode 100755
index 1d5d0b1ee813..000000000000
--- a/kcov-38/tests/bash/shell-main
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env bash
-
-function fn0() {
-    echo "fn0 $1"
-}
-
-fn1() # Other fn syntax
-{
-    echo "fn1: Are we really executing this?"
-}
-
-function fn2 { # Yet another
-    echo fn2
-}
-
-function fn3
-{ # Yet yet another
-    echo fn3
-}
-
-
-fn0
-
-if [ $# -eq 1 ] ; then
-	fn1
-fi
-
-A=5
-while [ $A -gt 0 ] ; do
-	A=$(($A - 1))
-	echo $A
-done 
-
-# Comment
-case $# in
-    1)
-      	echo "1 args"
-        ;;
-    (2)
-      	echo "2 args" ;;# Comment
-    'sorry mister')
-        echo "This is very much dead code!"
-        ;;
-    "SORRY")
-    	echo "and more of that here"
-        ;;
-    *)
-      	echo "else args $#"
-        ;;
-esac
-
-for idx in 1 \
-    2 \
-    3 \
-    4 ; do
-    echo "IDX: $idx"
-done
-
-cat <<EOF
-here document
-is here
-EOF
-
-. `dirname $0`/other.sh
-
-if [ $# -eq 2 ] ; then
-	. `dirname $0`/other.sh 5
-fi
-
-if [ $# -gt 0 ]
-then
-	exit $1
-fi
-
-A=awk  '{print HEJ}'<<<$0
-
-echo hoppsan
-
-exec 3>&1
-exec 4>&2
-exec 2>>$1
-exec 1>>$1
-echo hopp
-
-`dirname $0`/short-test.sh
-
-# Issue #50: This breaks
-cat<<EOF || echo "cat failed"
-foo
-bar
-EOF
-
-echo "From here on it do not work!"
-
-`dirname $0`/sh-shebang.sh
-
-# Echo to stderr
->&2 echo "I'm echoing to stderr via some illogical interface"
-
-function some_test
-    {
-    test "${1}" == "--quiet" &&
-        { quiet=${1} ; shift ; echo hej ; }
-    }
-
-some_test --quiet
-
-declare -r NIGHTLY_CODE_PROJECT_MASK=$(( 1 << 0 ))
-declare -r NIGHTLY_TESTS_PROJECT_MASK=$(( 1 << 1 ))
-declare -r NIGHTLY_DOCS_PROJECT_MASK=$(( 1 << 2 ))
-echo $((
- 1 << 1))
-
-echo $((
- 3 << 1
-))
-
-let "a = 1 << 3"
-
-echo After
-
-var=(c)
-test ${#var[*]} -gt 2 -o \
-     "${var[$((${#var[*]} - 1))]}" != "c" ||
-    {
-    echo Some line
-    }
-echo Something else
-
-
-MESSAGE="some message"
-USAGE="usage: some message
-
-   --some-option   Does something
-"
-echo "After usage"
-
-# Issue 116
-SUB=30
-max=$[ 1 << (32 - SUB) ]
-
-echo "$max covered?"
-
-# Issue 116
-cat <<-!
-    Middle
-!
-
-echo "Covered?"
-
-id="# ${work_runtime_error}."
-echo afterid
-
-source `dirname $0`/first-dir/a.sh
-source `dirname $0`/first-dir/b.sh
-source `dirname $0`/first-dir/c.sh
-
-# Issue 152
-# Test 1: Coverage works fine
-printf "foo\nbar\n" | while read -r line
-do
-    echo line: "$line"
-done
-
-# Test 2: Coverage missed for line with here-document
-while read -r line
-do
-    echo line: "$line"
-done <<eof
-baz
-qux
-eof
-
-
-# Issue 154
-booknames=`sqlplus -S -R 3 "$LOGON_STR" <<-EOF
-       select name from books;
-       exit;
-EOF`
-echo $booknames
diff --git a/kcov-38/tests/bash/short-test.sh b/kcov-38/tests/bash/short-test.sh
deleted file mode 100755
index a5d9504dafff..000000000000
--- a/kcov-38/tests/bash/short-test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-for f in 0 1 2 3 4 5 6 7 8 9 10
-do
-	echo $f
-done
diff --git a/kcov-38/tests/bash/subshell.sh b/kcov-38/tests/bash/subshell.sh
deleted file mode 100755
index 05bf1b55a4b5..000000000000
--- a/kcov-38/tests/bash/subshell.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#/bin/sh
-eval "(echo Stuff in subshell
-echo More stuff in subshell
-      ) "
-echo "Inbetween stuff"
-(echo "Other subshell"
-echo More stuff in Other subshell
-)
diff --git a/kcov-38/tests/bash/trap.sh b/kcov-38/tests/bash/trap.sh
deleted file mode 100755
index 1cf632b0ec7d..000000000000
--- a/kcov-38/tests/bash/trap.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-on_trap()
-{
-	echo "On trap"
-	exit 1
-}
-
-trap on_trap SIGTERM
-
-
-while true
-	do read x
-done
diff --git a/kcov-38/tests/bash/unitundertest.sh b/kcov-38/tests/bash/unitundertest.sh
deleted file mode 100755
index 555d249acd79..000000000000
--- a/kcov-38/tests/bash/unitundertest.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#unitundertest.sh
-
-block1()
-{
-    echo "In block1()"
-
-    for f in 1 2 3 4 5
-    do
-        echo $f
-    done
-}
-
-block2()
-{
-    echo "In block2()"
-
-    for f in 1 2 3 4 5
-    do
-        echo $f
-    done
-}
-
-#
-# Main
-#
-
-case $1 in
-1)
-    block1
-    ;;
-2)
-    block2
-    ;;
-all)
-    block1
-    block2
-    ;;
-esac
-exit 0
diff --git a/kcov-38/tests/daemon/test-daemon.cc b/kcov-38/tests/daemon/test-daemon.cc
deleted file mode 100644
index dd24cbf18433..000000000000
--- a/kcov-38/tests/daemon/test-daemon.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-void daemonize(void)
-{
-	pid_t child;
-
-	child = fork();
-
-	if (child < 0) {
-		perror("Fork failed?\n");
-		exit(3);
-	} else if (child == 0) {
-		child = fork();
-
-		if (child < 0) {
-			perror("Fork failed?\n");
-			exit(3);
-		} else if (child > 0) {
-			// Second parent
-			exit(1);
-		} else {
-			freopen( "/dev/null", "r", stdin);
-			freopen( "/dev/null", "w", stdout);
-			freopen( "/dev/null", "w", stderr);
-
-			// Daemonized child, just exit after a while
-			sleep(5);
-			exit(4);
-		}
-	} else {
-		// First parent
-		exit(2);
-	}
-}
-
-int main(int argc, const char *argv[])
-{
-	daemonize();
-
-	return 0;
-}
diff --git a/kcov-38/tests/daemon/test-issue31.cc b/kcov-38/tests/daemon/test-issue31.cc
deleted file mode 100644
index 15e82ba0bab5..000000000000
--- a/kcov-38/tests/daemon/test-issue31.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <iostream>
-#include <fstream>
-#include<pthread.h>
-#include<sys/types.h>
-#include<unistd.h>
-
-void* thread_main(void *) {
-  std::ofstream ofs("thread.log");
-  int i = 0;
-  while(true) {
-    ofs << ++i << std::endl;
-    sleep(1);
-  }
-
-  return NULL;
-}
-
-int main() {
-  pthread_t t;
-  int thread_code = pthread_create(&t, NULL, thread_main, NULL);
-
-  if (thread_code < 0)
-	  return 1;
-
-  std::ofstream ofs("main.log");
-  int i = 0;
-  while(true) {
-    ofs << ++i << std::endl;
-    sleep(1);
-  }
-  return 0;
-}
diff --git a/kcov-38/tests/daemon/test-script.sh b/kcov-38/tests/daemon/test-script.sh
deleted file mode 100755
index 0291fa03bf04..000000000000
--- a/kcov-38/tests/daemon/test-script.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 3 ] ; then
-	echo "Usage: <kcov-binary> <out-dir> <program-to-run>"
-	exit 1
-fi
-
-kcov=$1
-out=$2
-prg=$3
-
-$prg &
-pid=$!
-
-sleep 0.5
-$kcov --pid=$pid $out $prg &
-kcov_pid=$!
-
-sleep 1.2
-kill $kcov_pid
diff --git a/kcov-38/tests/dlopen/dlopen-main.cc b/kcov-38/tests/dlopen/dlopen-main.cc
deleted file mode 100644
index aa8795aa90e7..000000000000
--- a/kcov-38/tests/dlopen/dlopen-main.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-extern void do_dlopen();
-
-int main(int argc, const char *argv[])
-{
-	do_dlopen();
-	sleep(1);
-
-	return 0;
-}
diff --git a/kcov-38/tests/dlopen/dlopen.cc b/kcov-38/tests/dlopen/dlopen.cc
deleted file mode 100644
index a86d4f769357..000000000000
--- a/kcov-38/tests/dlopen/dlopen.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void do_dlopen()
-{
-	void *handle;
-	int (*sym)(int);
-
-	handle = dlopen("libshared_library.so", RTLD_LAZY);
-	if (!handle) {
-		printf("Can't dlopen\n");
-		exit(1);
-	}
-
-	dlerror();
-	sym = (int (*)(int))dlsym(handle, "vobb");
-	if (!sym) {
-		printf("No symbol\n");
-		dlclose(handle);
-		exit(1);
-	}
-
-	int a = sym(5);
-	printf("from shared lib: %d\n", a);
-
-	dlclose(handle);
-}
diff --git a/kcov-38/tests/fork/fork+exec.c b/kcov-38/tests/fork/fork+exec.c
deleted file mode 100644
index 4443528da84c..000000000000
--- a/kcov-38/tests/fork/fork+exec.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sched.h>
-
-
-int main(int argc, const char *argv[])
-{
-	pid_t child;
-	int status;
-
-	child = fork();
-	if (child < 0) {
-		fprintf(stderr, "fork failed!\n");
-		return -1;
-	}
-
-	if (child > 0) {
-		printf("Parent %d\n", getpid());
-	} else if (child < 0) {
-		printf("ERROR!\n");
-	} else {
-		printf("Child, will exec()\n");
-		execvp(argv[1], NULL);
-	}
-
-	waitpid(child, &status, 0);
-
-	return 0;
-}
diff --git a/kcov-38/tests/fork/fork-no-wait.c b/kcov-38/tests/fork/fork-no-wait.c
deleted file mode 100644
index 4d64a97accce..000000000000
--- a/kcov-38/tests/fork/fork-no-wait.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sched.h>
-
-
-int main(int argc, const char *argv[])
-{
-	pid_t child;
-
-	child = fork();
-	if (child < 0) {
-		fprintf(stderr, "fork failed!\n");
-		return -1;
-	}
-
-	if (child > 0)
-		printf("Parent %d. Will exit\n", getpid());
-	else {
-		printf("In child, waiting\n");
-		sleep(1);
-		printf("Wait done, parent should be finished by now\n");
-	}
-
-	/* No wait for children */
-
-	return 4; // To test non-0/-1/1 exit codes
-}
diff --git a/kcov-38/tests/fork/fork.c b/kcov-38/tests/fork/fork.c
deleted file mode 100644
index 14317aa2ac40..000000000000
--- a/kcov-38/tests/fork/fork.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-// Space added
-// ... so that I don't have to change the tests :-)
-static void mibb(void)
-{
-	printf("Mibb\n");
-}
-
-int main(int argc, const char *argv[])
-{
-	pid_t child;
-	int status;
-
-	child = fork();
-	if (child < 0) {
-		fprintf(stderr, "fork failed!\n");
-		return -1;
-	}
-
-	if (child > 0)
-		printf("Parent %d\n", getpid());
-	else {
-		pid_t grand_child = fork();
-
-
-		if (grand_child < 0)
-			fprintf(stderr, "fork gc failed\n");
-		else if (grand_child == 0) {
-			printf("Grandchild %d\n", getpid());
-			mibb();
-		} else
-			printf("Child %d\n", getpid());
-		wait(&status);
-	}
-
-	mibb();
-
-	printf("Waiting in %d\n", getpid());
-	wait(&status);
-
-	return 0;
-}
diff --git a/kcov-38/tests/fork/vfork.c b/kcov-38/tests/fork/vfork.c
deleted file mode 100644
index 180760bf9fac..000000000000
--- a/kcov-38/tests/fork/vfork.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-int main(int argc, const char *argv[])
-{
-	pid_t child;
-	int status;
-
-	child = vfork();
-	if (child < 0) {
-		fprintf(stderr, "vfork failed!\n");
-		return -1;
-	}
-
-	if (child > 0)
-		printf("Parent %d\n", getpid());
-	else {
-		execle("/bin/ls", "/bin/ls", "/bin/ls", NULL, NULL);
-	}
-
-	wait(&status);
-
-	return 0;
-}
diff --git a/kcov-38/tests/global-constructors/test-global-ctors.cc b/kcov-38/tests/global-constructors/test-global-ctors.cc
deleted file mode 100644
index aaded3cb95bb..000000000000
--- a/kcov-38/tests/global-constructors/test-global-ctors.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <string>
-#include <stdio.h>
-
-std::string glob = "Kalle";
-
-int main(int argc, const char *argv[])
-{
-	if (argc > 1)
-		glob = "Manne";
-
-	printf("XXX: %s\n", glob.c_str());
-
-	return 0;
-}
diff --git a/kcov-38/tests/include/header.h b/kcov-38/tests/include/header.h
deleted file mode 100644
index 8f0915c961a1..000000000000
--- a/kcov-38/tests/include/header.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef HEADER_H
-#define HEADER_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void tjoho(int a);
-void tjoho2(int a);
-
-#if defined(__cplusplus)
-};
-#endif
-
-#endif
-
-
diff --git a/kcov-38/tests/main.cc b/kcov-38/tests/main.cc
deleted file mode 100644
index 034d660773dd..000000000000
--- a/kcov-38/tests/main.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdio.h>
-#include "include/header.h"
-
-class Test
-{
-public:
-	Test()
-	{
-		printf("Constructor\n");
-	}
-
-	void hello()
-	{
-		printf("Hello\n");
-	}
-};
-
-static Test g_test;
-
-int main(int argc, const char *argv[])
-{
-	tjoho(1);
-	tjoho2(0);
-
-	return 0;
-}
diff --git a/kcov-38/tests/merge-tests/file.c b/kcov-38/tests/merge-tests/file.c
deleted file mode 100644
index e80ffe13323d..000000000000
--- a/kcov-38/tests/merge-tests/file.c
+++ /dev/null
@@ -1,9 +0,0 @@
-int vobb(void)
-{
-	return 15;
-}
-
-int mibb(void)
-{
-	return 27;
-}
diff --git a/kcov-38/tests/merge-tests/main_1.c b/kcov-38/tests/merge-tests/main_1.c
deleted file mode 100644
index 6a6e548dfb8f..000000000000
--- a/kcov-38/tests/merge-tests/main_1.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-extern int vobb(void);
-
-int main(int argc, const char *argv[])
-{
-	int v = 0;
-
-	if (argc > 1)
-		v = vobb();
-
-	printf("First: V is %d\n", v);
-}
diff --git a/kcov-38/tests/merge-tests/main_2.c b/kcov-38/tests/merge-tests/main_2.c
deleted file mode 100644
index 0facd2390770..000000000000
--- a/kcov-38/tests/merge-tests/main_2.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-extern int mibb(void);
-
-int main(int argc, const char *argv[])
-{
-	int v = 0;
-
-	if (argc > 1)
-		v = mibb();
-
-	printf("Second: V is %d\n", v);
-}
diff --git a/kcov-38/tests/multi-fork/code-template.c b/kcov-38/tests/multi-fork/code-template.c
deleted file mode 100644
index f4d650fb339c..000000000000
--- a/kcov-38/tests/multi-fork/code-template.c
+++ /dev/null
@@ -1,29 +0,0 @@
-	volatile double out = 199992.5;
-
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	out = out + sqrt(out);
-	return out;
diff --git a/kcov-38/tests/multi-fork/generate-functions.py b/kcov-38/tests/multi-fork/generate-functions.py
deleted file mode 100755
index 9fb584ef5549..000000000000
--- a/kcov-38/tests/multi-fork/generate-functions.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-def generate(idx, template):
-	print("double fn%d(void) {" % (idx))
-	print("%s" % (template))
-	print("}")
-	print("")
-
-def generate_table(n):
-	print("const unsigned n_functions = %d;" % (n))
-	print("double (*functions[])(void) = {")
-	for i in range(0, n):
-		print("    fn%d," % (i))
-	print("};")
-	
-if __name__ == "__main__":
-	fileName = sys.argv[1]
-	f = open(fileName)
-	template = f.read()
-	f.close()
-	
-	n = int(sys.argv[2])
-
-	print("#include <math.h>")
-	for i in range(0, n):
-		generate(i, template)
-	generate_table(n)
diff --git a/kcov-38/tests/multi-fork/test-multi-fork.c b/kcov-38/tests/multi-fork/test-multi-fork.c
deleted file mode 100644
index 435e1ce766db..000000000000
--- a/kcov-38/tests/multi-fork/test-multi-fork.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <sys/mman.h>
-
-#include "multi-fork-generated.c"
-
-int main(int argc, const char *argv[])
-{
-	size_t sz = 16 * 1024 * 1024;
-	unsigned i;
-	size_t n = n_functions;
-
-	for (i = 0; i < n; i++) {
-		pid_t child;
-
-		child = fork();
-		if (child < 0) {
-			fprintf(stderr, "fork failed!\n");
-			return 1;
-		}
-
-		if (child == 0) {
-			// Child
-			functions[i]();
-			exit(0);
-		}
-	}
-
-	while (1) {
-		int status;
-		int res;
-
-		res = wait(&status);
-		// No more children
-		if (res == -1)
-			break;
-	}
-
-	return 0;
-}
diff --git a/kcov-38/tests/pie.c b/kcov-38/tests/pie.c
deleted file mode 100644
index 679b35e088b3..000000000000
--- a/kcov-38/tests/pie.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main()
-{
-	printf("Hello\n");
-}
-
diff --git a/kcov-38/tests/popen/test-popen.c b/kcov-38/tests/popen/test-popen.c
deleted file mode 100644
index 7c17b1a782fc..000000000000
--- a/kcov-38/tests/popen/test-popen.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <sys/statvfs.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-int test_popen(void)
-{
-	void *data = NULL;
-	size_t chunk = 1024;
-	size_t alloc_sz = chunk;
-	size_t sz = 0;
-	FILE *fp;
-
-	fp = popen("/bin/ls -l /", "r");
-	if (!fp)
-	{
-		fprintf(stderr, "popen failed\n");
-		return 1;
-	}
-
-	/* Read in the entire file */
-	while (!feof(fp)) {
-		size_t ret;
-
-		data = realloc(data, alloc_sz);
-		if (!data)
-		{
-			fprintf(stderr, "realloc %zu failed\n", alloc_sz);
-			break;
-		}
-
-		ret = fread((uint8_t *)data + sz, 1, chunk, fp);
-		sz += ret;
-		/* Reached the end */
-		if (ret < chunk)
-			break;
-		alloc_sz += chunk;
-	}
-
-	free(data);
-
-	pclose(fp);
-
-	return 0;
-}
-
-int main(int argc, const char *argv[])
-{
-	unsigned i;
-
-	for (i = 0; i < 30; i++) {
-		printf("Round %u\n", i);
-		if (test_popen() != 0) {
-			printf("FAIL\n");
-			exit(0);
-		}
-	}
-	printf("popen OK\n");
-
-	return 0;
-}
diff --git a/kcov-38/tests/python/main b/kcov-38/tests/python/main
deleted file mode 100755
index 6c1c9ede8b19..000000000000
--- a/kcov-38/tests/python/main
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import second
-
-def fn():
-    print("hello!")
-    return
-
-def loop_fn():
-    for i in range(0,10):
-        print("NR %d" % (i))
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("Need at least one arg")
-        sys.exit(1)
-
-    fn()
-    print("in main, but will return soon")
-    second.second_fn(int(sys.argv[1]))
-
-    try:
-        if int(sys.argv[1]) > 10:
-            raise Exception("metallgutten")
-    except:
-        print("Got an exception")
-
-    loop_fn()
-    sys.exit(int(sys.argv[1]))
diff --git a/kcov-38/tests/python/second.py b/kcov-38/tests/python/second.py
deleted file mode 100644
index 148d8fce9bba..000000000000
--- a/kcov-38/tests/python/second.py
+++ /dev/null
@@ -1,78 +0,0 @@
-def second_fn(arg):
-    if arg > 5: # Comment here, but valid line
-        print("Yep")
-    # This is a comment
-    print("Hopp")
-    kalle_anka()
-    arne_anka(arg)
-
-def kalle_anka():
-    '''
-    satt
-    pa en planka
-'''
-    pass
-
-def arne_anka(arg):
-    b = """
-    satt
-    inte
-    pa
-    en
-    planka
-"""
-    print(b)
-    jens_anka(arg)
-    jens_anka(9)
-
-def viktor_anka():
-    """Single-line multi-line string"""
-
-    return 0
-
-def jens_anka(kalle):
-    v = """Single-line multi-line string"""
-
-    if kalle > 5:
-        print("Hej")
-    elif kalle > 128:
-        print("Commodore 128")
-    else:
-        print("Hopp")
-    sven_anka()
-
-def sven_anka():
-    'single-quoted line'
-    jerker_anka()
-
-def mats_anka():
-    "single-quoted line"
-    pass
-
-dict = {
-    2 : [ 1, 2, 3],
-    3 : [ 4,
-         5, 6
-        ],
-    5 :
-        {
-         9 : 1,
-         },
-    6 :
-        { },
-    7 :
-        { 1 : 2
-         },
-    8 :
-        [
-         1, 2
-         ]
-}
-
-def jerker_anka():
-    try:
-        f = open("/tmp/a")
-    except:
-        print("Exception")
-    finally:
-        print("Finally finally!")
diff --git a/kcov-38/tests/python/short-test.py b/kcov-38/tests/python/short-test.py
deleted file mode 100755
index 711ca606b3d3..000000000000
--- a/kcov-38/tests/python/short-test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-def doSomething():
-    print 'Hello world'
-
-
-if __name__ == '__main__':
-    doSomething()
diff --git a/kcov-38/tests/python/unittest/testdriver b/kcov-38/tests/python/unittest/testdriver
deleted file mode 100755
index 9c474ef5e3de..000000000000
--- a/kcov-38/tests/python/unittest/testdriver
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import unittest
-
-class testcase (unittest.TestCase):
-
-    def setUp(self):
-        print('in setUp()')
-        self.unitundertest = unitundertest.testme()
-
-    def testMethod1(self):
-        print('in testcase.testMethod1()')
-        expected=4
-        result= self.unitundertest.testmethod1(2,2)
-
-        self.assertEqual(expected,result)
-
-
-if __name__ == '__main__':
-    sys.path.append('.')
-
-    try:
-        import unitundertest
-    except:
-        print('exception')
-
-    unittest.main()
diff --git a/kcov-38/tests/python/unittest/unitundertest.py b/kcov-38/tests/python/unittest/unitundertest.py
deleted file mode 100644
index 0f66e70b3c45..000000000000
--- a/kcov-38/tests/python/unittest/unitundertest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-class testme:
-    def __init__(self):
-        print('ctor')
-
-    def testmethod1(self,a,b):
-        print('in testmethod1()')
-        return a+b
diff --git a/kcov-38/tests/recursive-ptrace/main.cc b/kcov-38/tests/recursive-ptrace/main.cc
deleted file mode 100644
index 8e97affa40db..000000000000
--- a/kcov-38/tests/recursive-ptrace/main.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sched.h>
-#include <stdio.h>
-
-int forkAndAttach()
-{
-	pid_t child, who;
-	int status;
-
-	child = fork();
-	if (child < 0) {
-		fprintf(stderr, "fork failed!\n");
-		return -1;
-	}
-
-	if (child == 0) {
-		int res;
-
-		/* We're in the child, set me as traced */
-#ifdef __linux__
-		res = ptrace(PTRACE_TRACEME, 0, 0, 0);
-#elif defined(__FreeBSD__)
-		res = ptrace(PT_TRACE_ME, 0, 0, 0);
-#endif
-		if (res < 0) {
-			fprintf(stderr, "Can't set me as ptraced\n");
-			return -1;
-		}
-		::kill(getpid(), SIGSTOP);
-
-		return 0;
-	}
-
-	/* Wait for the initial stop */
-	who = waitpid(child, &status, 0);
-	if (who < 0) {
-		fprintf(stderr, "waitpid failed\n");
-		return -1;
-	}
-	if (!WIFSTOPPED(status)) {
-		fprintf(stderr, "Child hasn't stopped: %x\n", status);
-		return -1;
-	}
-#ifdef __linux__
-	ptrace(PTRACE_SETOPTIONS, child, 0, PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK);
-#elif defined(__FreeBSD__)
-	ptrace(PT_FOLLOW_FORK, child, NULL, 1);
-#endif
-
-	return child;
-}
-
-int main(int argc, const char *argv[])
-{
-	int res = forkAndAttach();
-
-	if (res >= 0)
-		printf("OK!\n");
-	else
-		printf("NOK!\n");
-
-	return res >= 0;
-}
diff --git a/kcov-38/tests/sanitizer-coverage.c b/kcov-38/tests/sanitizer-coverage.c
deleted file mode 100644
index b9717a4442ba..000000000000
--- a/kcov-38/tests/sanitizer-coverage.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdio.h>
-
-static int fn(int a)
-{
-	printf("fn %d\n", a);
-
-	a = a + 1;
-	a = a + 2;
-
-	return a + 3;
-}
-
-int main(int argc, const char *argv[])
-{
-	if (argc == 1) {
-		int out = fn(argc + 1);
-
-		out++;
-
-		return out;
-	} else {
-		fn(5);
-	}
-
-	return 0;
-}
diff --git a/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc b/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
deleted file mode 100644
index 7b57d1d2785a..000000000000
--- a/kcov-38/tests/setpgid-kill/setpgid-kill-main.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-#include <utils.hh>
-
-int main (int argc, char** argv)
-{
-    printf("pid: %d\n", getpid());
-    printf("pgid: %d\n", getpgid(0));
-
-    printf("calling setpgid...\n");
-    const int result = setpgid(0, 0);
-    printf("setpgid result: %d\n", result);
-
-    int pid = getpid();
-    printf("pid: %d\n", pid);
-    printf("pgid: %d\n", getpgid(0));
-
-    std::string s = fmt("%d\n", pid);
-    write_file(s.c_str(), s.size(), "/tmp/setpgid.pid");
-
-    // Long sleep just to allow kcov to clean up stuff
-    sleep(20);
-
-    printf("After sleep\n");
-
-    return 0;
-}
diff --git a/kcov-38/tests/setpgid-kill/test-script.sh b/kcov-38/tests/setpgid-kill/test-script.sh
deleted file mode 100755
index 7c34ed9c36af..000000000000
--- a/kcov-38/tests/setpgid-kill/test-script.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-prg=$*
-
-$prg &
-sleep 1
-kill -TERM %1
-
-sleep 2
-
-pid=`cat /tmp/setpgid.pid`
-if ps -p $pid > /dev/null ; then
-	echo "FAIL"
-else
-	echo "SUCCESS"
-fi
diff --git a/kcov-38/tests/shared-library/big-symbol.S b/kcov-38/tests/shared-library/big-symbol.S
deleted file mode 100644
index 1675d6645cbd..000000000000
--- a/kcov-38/tests/shared-library/big-symbol.S
+++ /dev/null
@@ -1,9 +0,0 @@
-.text
-.globl very_big_symbol
-very_big_symbol:
-	.fill 4096, 1, 0x90
-#if defined(__PPC__)
-	blr
-#else
-	ret
-#endif
diff --git a/kcov-38/tests/shared-library/main.c b/kcov-38/tests/shared-library/main.c
deleted file mode 100644
index 1b00a3b84306..000000000000
--- a/kcov-38/tests/shared-library/main.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-extern int vobb(int a);
-
-int main(int argc, const char *argv[])
-{
-	printf("In main\n");
-
-	vobb(argc);
-
-	return 0;
-}
diff --git a/kcov-38/tests/shared-library/recursive-ld-preload.c b/kcov-38/tests/shared-library/recursive-ld-preload.c
deleted file mode 100644
index 4c327bea4ac9..000000000000
--- a/kcov-38/tests/shared-library/recursive-ld-preload.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-// Load this library and exit again!
-void __attribute__((constructor)) meaningless_library()
-{
-	exit(93);
-}
diff --git a/kcov-38/tests/shared-library/solib.c b/kcov-38/tests/shared-library/solib.c
deleted file mode 100644
index 571d5539f4cf..000000000000
--- a/kcov-38/tests/shared-library/solib.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-
-int vobb(int a)
-{
-	printf("In shared library\n");
-
-	a = a + 1;
-
-	if (a > 2)
-		return 1;
-
-	return 0;
-}
-
-void this_function_should_not_be_called(void)
-{
-	printf("If it is, something is wrong\n");
-}
diff --git a/kcov-38/tests/short-file.c b/kcov-38/tests/short-file.c
deleted file mode 100644
index 574741f80814..000000000000
--- a/kcov-38/tests/short-file.c
+++ /dev/null
@@ -1 +0,0 @@
-int main() {return 99;}
diff --git a/kcov-38/tests/signals/test-signals.c b/kcov-38/tests/signals/test-signals.c
deleted file mode 100644
index 7a122d1ac34e..000000000000
--- a/kcov-38/tests/signals/test-signals.c
+++ /dev/null
@@ -1,297 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <sched.h>
-
-
-void catch_hup(int sig)
-{
-	printf("HUP\n");
-}
-
-void catch_int(int sig)
-{
-	printf("INT\n");
-}
-
-void catch_quit(int sig)
-{
-	printf("QUIT\n");
-}
-
-void catch_ill(int sig)
-{
-	printf("ILL\n");
-}
-
-void catch_trap(int sig)
-{
-	printf("TRAP\n");
-}
-
-void catch_abrt(int sig)
-{
-	printf("ABRT\n");
-}
-
-void catch_bus(int sig)
-{
-	printf("BUS\n");
-}
-
-void catch_fpe(int sig)
-{
-	printf("FPE\n");
-}
-
-void catch_kill(int sig)
-{
-	printf("KILL\n");
-}
-
-void catch_usr1(int sig)
-{
-	printf("USR1\n");
-}
-
-void catch_segv(int sig)
-{
-	printf("SEGV\n");
-}
-
-void catch_usr2(int sig)
-{
-	printf("USR2\n");
-}
-
-void catch_pipe(int sig)
-{
-	printf("PIPE\n");
-}
-
-void catch_alarm(int sig)
-{
-	printf("ALARM\n");
-}
-
-void catch_term(int sig)
-{
-	printf("TERM\n");
-}
-
-void catch_stkflt(int sig)
-{
-	printf("STKFLT\n");
-}
-
-void catch_chld(int sig)
-{
-	printf("CHLD\n");
-}
-
-void catch_cont(int sig)
-{
-	printf("CONT\n");
-}
-
-void catch_stop(int sig)
-{
-	printf("STOP\n");
-}
-
-void catch_stp(int sig)
-{
-	printf("STP\n");
-}
-
-void catch_ttin(int sig)
-{
-	printf("TTIN\n");
-}
-
-void catch_ttou(int sig)
-{
-	printf("TTOU\n");
-}
-
-void catch_urg(int sig)
-{
-	printf("URG\n");
-}
-
-void catch_xcpu(int sig)
-{
-	printf("XCPU\n");
-}
-
-void catch_xfsz(int sig)
-{
-	printf("XFSZ\n");
-}
-
-void catch_vtalrm(int sig)
-{
-	printf("VTALRM\n");
-}
-
-void catch_prof(int sig)
-{
-	printf("PROF\n");
-}
-
-void catch_winch(int sig)
-{
-	printf("WINCH\n");
-}
-
-void catch_gio(int sig)
-{
-	printf("GIO\n");
-}
-
-void catch_pwr(int sig)
-{
-	printf("PWR\n");
-}
-
-void catch_sys(int sig)
-{
-	printf("SYS\n");
-}
-
-static const char *handler_names[] =
-{
-	"zero has no handler",
-	"hup",
-	"int",
-	"quit",
-	"ill",
-	"trap",
-	"abrt",
-	"bus",
-	"fpe",
-	"kill",
-	"usr1",
-	"segv",
-	"usr2",
-	"pipe",
-	"alarm",
-	"term",
-	"stkflt",
-	"chld",
-	"cont",
-	"stop",
-	"stp",
-	"ttin",
-	"ttou",
-	"urg",
-	"xcpu",
-	"xfsz",
-	"vtalrm",
-	"prof",
-	"winch",
-	"gio",
-	"pwr",
-	"sys",
-};
-
-static void (*handler_table[])(int) =
-{
-	NULL,
-	catch_hup,  //SIGHUP
-	catch_int,  //SIGINT
-	catch_quit, //SIGQUIT
-	catch_ill,  //SIGILL
-	catch_trap, //SIGTRAP
-	catch_abrt, //SIGABRT
-	catch_bus,  //SIGBUS
-	catch_fpe,  //SIGFPE
-	catch_kill, //SIGKILL
-	catch_usr1, //SIGUSR1
-	catch_segv, //SIGSEGV
-	catch_usr2, //SIGUSR2
-	catch_pipe, //SIGPIPE
-	catch_alarm,//SIGALRM
-	catch_term, //SIGTERM
-	catch_stkflt,//SIGSTKFLT
-	catch_chld, //SIGCHLD
-	catch_cont, //SIGCONT
-	catch_stop, //SIGSTOP
-	catch_stp,  //SIGTSTP
-	catch_ttin, //SIGTTIN
-	catch_ttou, //SIGTTOU
-	catch_urg,  //SIGURG
-	catch_xcpu, //SIGXCPU
-	catch_xfsz, //SIGXFSZ
-	catch_vtalrm,//SIGVTALRM
-	catch_prof, //SIGPROF
-	catch_winch,//SIGWINCH
-	catch_gio,  //SIGIO
-	catch_pwr,  //SIGPWR
-	catch_sys,  //SIGSYS
-};
-
-
-
-int main(int argc, const char *argv[])
-{
-	pid_t child;
-	int status;
-	int sig;
-	unsigned self = 0;
-	size_t n_handlers = sizeof(handler_names) / sizeof(handler_names[0]);
-
-	if (argc <= 1) {
-		printf("Usage: xxx <signal> [self]\n");
-		exit(1);
-	}
-
-	if (argc == 3)
-		self = 1;
-
-	for (sig = 0; sig < n_handlers; sig++) {
-			if (strcmp(argv[1], handler_names[sig]) == 0)
-				break;
-	}
-	if (sig == n_handlers) {
-		printf("Unknown handler %s\n", argv[1]);
-		exit(1);
-	}
-
-	if (self) {
-		// Test actual crashes / panics
-		if (sig != SIGABRT && sig != SIGSEGV)
-			signal(sig, handler_table[sig]);
-
-		kill(getpid(), sig);
-
-		return 0;
-	}
-
-
-	child = fork();
-	if (child < 0) {
-		fprintf(stderr, "fork failed!\n");
-		return -1;
-	}
-
-	if (child == 0) {
-		signal(sig, handler_table[sig]);
-
-		sleep(2);
-		return 0;
-	} else {
-		// Parent
-		sleep(1);
-		kill(child, sig);
-	}
-
-	wait(&status);
-
-	return 0;
-}
diff --git a/kcov-38/tests/subdir/file.c b/kcov-38/tests/subdir/file.c
deleted file mode 100644
index 708ee866a3c3..000000000000
--- a/kcov-38/tests/subdir/file.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include "../include/header.h"
-
-void tjoho(int a)
-{
-	if (a)
-		printf("Hej\n");
-}
diff --git a/kcov-38/tests/subdir2/file.c b/kcov-38/tests/subdir2/file.c
deleted file mode 100644
index bd3e5b5d80d1..000000000000
--- a/kcov-38/tests/subdir2/file.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include "../include/header.h"
-
-void tjoho2(int a)
-{
-	if (a)
-		printf("Hej\n");
-}
diff --git a/kcov-38/tests/subdir2/file2.c b/kcov-38/tests/subdir2/file2.c
deleted file mode 100644
index bd3e5b5d80d1..000000000000
--- a/kcov-38/tests/subdir2/file2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include "../include/header.h"
-
-void tjoho2(int a)
-{
-	if (a)
-		printf("Hej\n");
-}
diff --git a/kcov-38/tests/test-module/Makefile b/kcov-38/tests/test-module/Makefile
deleted file mode 100644
index df235385a659..000000000000
--- a/kcov-38/tests/test-module/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-
-CFLAGS_test_module.o += -g3
-
-obj-m += test_module.o
-
-default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-clean:
-	rm -f *.o *.ko *.order *.symvers *.mod.c
diff --git a/kcov-38/tests/test-module/test_module.c b/kcov-38/tests/test-module/test_module.c
deleted file mode 100644
index 6c26335563b7..000000000000
--- a/kcov-38/tests/test-module/test_module.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Copyright (C) 2012 Simon Kagstrom
- *
- * Author: Simon Kagstrom <simon.kagstrom@gmail.com>
- *
- * Most of the stuff comes from Jonathan Corbets seqfile example here:
- *
- *   http://lwn.net/Articles/22359/
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/proc_fs.h>
-#include <linux/fs.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-
-static int hz_show(struct seq_file *m, void *v)
-{
-    seq_printf(m, "%d\n", HZ);
-
-    return 0;
-}
-
-static int hz_open(struct inode *inode, struct file *file)
-{
-    return single_open(file, hz_show, NULL);
-}
-
-static const struct file_operations ct_file_ops = {
-    .owner	= THIS_MODULE,
-    .open	= hz_open,
-    .read	= seq_read,
-    .llseek	= seq_lseek,
-    .release = single_release,
-};
-
-static int __init test_init(void)
-{
-	struct proc_dir_entry *entry;
-
-	printk(KERN_INFO "initing test module!\n");
-
-	entry = create_proc_entry("test_module", 0, NULL);
-	if (entry)
-		entry->proc_fops = &ct_file_ops;
-	return 0;
-}
-
-static void __exit test_exit(void)
-{
-	remove_proc_entry("test_module", NULL);
-}
-
-module_init(test_init);
-module_exit(test_exit);
-MODULE_AUTHOR("Simon Kagstrom <simon.kagstrom@gmail.com>");
-MODULE_DESCRIPTION("Test");
-MODULE_LICENSE("GPL");
diff --git a/kcov-38/tests/threads/thread-main.c b/kcov-38/tests/threads/thread-main.c
deleted file mode 100644
index 43ae4e4dfd2c..000000000000
--- a/kcov-38/tests/threads/thread-main.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <pthread.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <semaphore.h>
-#include <stdlib.h>
-
-void *thread_cb(void *ptr)
-{
-	printf("Thread Created\r\n");
-
-	return NULL;
-}
-
-void* real_thread_create()
-{
-	pthread_t thr;
-	int i;
-
-	// 10 seconds
-	for (i = 0; i < 1000; i++) {
-		pthread_create(&thr, NULL, thread_cb, NULL);
-		usleep(10 * 1000); // 10 ms
-	}
-
-	return NULL;
-}
-
-
-int main(int argc, const char *argv[])
-{
-	pthread_t tid;
-	void *retv;
-
-	pthread_create(&tid, NULL, real_thread_create, NULL);
-
-	pthread_join(tid, &retv);
-
-	return 0;
-}
-
diff --git a/kcov-38/tests/tools/accumulate.py b/kcov-38/tests/tools/accumulate.py
deleted file mode 100644
index 9b04395c5d45..000000000000
--- a/kcov-38/tests/tools/accumulate.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import testbase
-import unittest
-import parse_cobertura
-
-class accumulate_data(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
-        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
-
-        rv,o = self.do(testbase.kcov + " "+ testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 2
-
-class dont_accumulate_data_with_clean(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
-        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
-
-        rv,o = self.do(testbase.kcov + " --clean "+ testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 0
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
-
-class merge_basic(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
-
-class merge_multiple_output_directories(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/first " + testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/second " + testbase.sources + "/tests/bash/shell-main")
-        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/first " + testbase.outbase + "/kcov/second")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/merged/kcov-merged/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
-
-class merge_merged_output(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/first " + testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/second " + testbase.sources + "/tests/bash/shell-main")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov/third " + testbase.sources + "/tests/bash/dollar-var-replacements.sh")
-
-        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/first " + testbase.outbase + "/kcov/second")
-        rv,o = self.do(testbase.kcov + " --merge " + testbase.outbase + "/kcov/merged2 " + testbase.outbase + "/kcov/merged " + testbase.outbase + "/kcov/third")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/merged2/kcov-merged/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
-        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1
-
-class merge_coveralls(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --coveralls-id=dry-run " + testbase.outbase + "/kcov/ " + testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " --coveralls-id=dry-run " + testbase.outbase + "/kcov/ " + testbase.sources + "/tests/bash/shell-main")
-
-        rv,o = self.doShell("grep second.py %s/kcov/main/coveralls.out" % (testbase.outbase))
-        assert rv == 0
-        rv,o = self.doShell("grep shell-main %s/kcov/shell-main/coveralls.out" % (testbase.outbase))
-        assert rv == 0
diff --git a/kcov-38/tests/tools/bash.py b/kcov-38/tests/tools/bash.py
deleted file mode 100644
index 5fe489de79e3..000000000000
--- a/kcov-38/tests/tools/bash.py
+++ /dev/null
@@ -1,326 +0,0 @@
-import testbase
-import os
-import unittest
-import parse_cobertura
-
-class BashBase(testbase.KcovTestCase):
-    def doTest(self, args):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main " + args)
-
-        return parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-
-class bash_coverage(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 3) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 13) == 0
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 26) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 30) == 5
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 34) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 38) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 5) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "short-test.sh", 5) == 11
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 128) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 132) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 135) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 136) == 1
-
-        assert b"I'm echoing to stderr via some" in o
-
-
-# Very limited, will expand once it's working better
-class bash_coverage_debug_trap(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-method=DEBUG " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 3) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 22) == 1
-
-class bash_short_file(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/short-test.sh")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/short-test.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "short-test.sh", 5) == 11
-
-class bash_heredoc_backslashes(BashBase):
-    def runTest(self):
-        dom = self.doTest("5")
-
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 52) == 4
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 53) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 55) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 59) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 61) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 62) == None
-
-class bash_heredoc_special_cases_issue_44(BashBase):
-    def runTest(self):
-        dom = self.doTest("")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 77) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 83) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 88) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 93) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 109) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 118) == 1
-
-class bash_non_empty_braces(BashBase):
-    def runTest(self):
-        dom = self.doTest("")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 102) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 103) == 3
-
-class bash_coverage_tricky(BashBase):
-    def runTest(self):
-        dom = self.doTest("5")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 36) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 44) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 7) == None
-
-class bash_honor_signal(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/trap.sh", False)
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/trap.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "trap.sh", 5) == 1
-
-class bash_accumulate_data(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 1")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 0
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 2")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 1
-
-class bash_accumulate_changed_data(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        os.system("mkdir -p /tmp/test-kcov")
-        os.system("cp " + testbase.sources + "/tests/bash/shell-main /tmp/test-kcov")
-        os.system("cp " + testbase.sources + "/tests/bash/other.sh /tmp/test-kcov")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov /tmp/test-kcov/shell-main 5 9")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 40) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 67) == 2
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 6) == 2
-        os.system("echo \"echo 'arne-anka'\" >> /tmp/test-kcov/shell-main")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov /tmp/test-kcov/shell-main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 40) == 0
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 67) == 0
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 6) == 3
-
-class bash_merge_data_issue_38(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 1")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 0
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh 2")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 6) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 16) == 1
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/unitundertest.sh all")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/unitundertest.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 36) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 30) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 33) == 1
-        assert parse_cobertura.hitsPerLine(dom, "unitundertest.sh", 36) == 1
-
-class bash_issue_116_arithmetic_and_heredoc_issue_117_comment_within_string(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 142) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 149) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 151) == 1
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 152) == 1
-
-class bash_multiline_quotes(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/multiline-alias.sh")
-
-        assert b"echo called test_alias" not in o
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/multiline-alias.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "multiline-alias.sh", 6) == 1
-
-class bash_multiline_backslashes(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/multiline-backslash.sh")
-
-        assert b"function_name" not in o
-
-class bash_no_executed_lines(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/no-executed-statements.sh")
-
-        assert b"echo called test_alias" not in o
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/no-executed-statements.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "no-executed-statements.sh", 4) == 0
-
-class bash_stderr_redirection(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/redirect-stderr.sh")
-
-        assert b"kcov" not in o
-        rv,o = self.do(testbase.kcov + " --debug-force-bash-stderr " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/redirect-stderr.sh")
-        assert b"kcov" not in o
-
-class bash_dollar_var_replacement(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/dollar-var-replacements.sh")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dollar-var-replacements.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1
-        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 4) == 1
-        assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 5) == 1
-
-# Issue #152
-class bash_done_eof(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 163) == None
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 169) == None
-
-# Issue #154
-class bash_eof_backtick(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 180) == 1
-
-class bash_subshell(testbase.KcovTestCase):
-    def runTest(self):
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/subshell.sh")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/subshell.sh/cobertura.xml")
-        self.assertIsNone(parse_cobertura.hitsPerLine(dom, "subshell.sh", 1))
-        self.assertEqual(2, parse_cobertura.hitsPerLine(dom, "subshell.sh", 4))
-        self.assertEqual(0, parse_cobertura.hitsPerLine(dom, "subshell.sh", 8))
-
-class bash_handle_all_output(testbase.KcovTestCase):
-    def runTest(self):
-        script = "handle-all-output.sh"
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " +
-            testbase.sources + "/tests/bash/" + script,
-            timeout=5.0)
-        self.assertEqual(0, rv, "kcov exited unsuccessfully")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/" + script + "/cobertura.xml")
-        self.assertIsNone(parse_cobertura.hitsPerLine(dom, script, 1))
-        self.assertEqual(1000, parse_cobertura.hitsPerLine(dom, script, 4))
-
-class bash_exit_status(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.sources + "/tests/bash/shell-main 5", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main 5")
-
-        assert rv == noKcovRv
-
-# Issue 180
-class bash_ignore_uncovered(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --exclude-region=CUSTOM_RANGE_START:CUSTOM_RANGE_END " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/other.sh")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/other.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 22) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 23) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 26) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 27) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 28) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 29) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 32) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 34) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 35) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 36) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 37) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 40) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 42) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 43) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 47) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 48) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 49) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 51) == 1
-
-        # Rust stuff
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 54) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 55) == 1
-
-# Issue #224
-class bash_can_find_non_executed_scripts(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "a.sh", 5) == 1
-        # Not executed
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == 0
-
-class bash_can_find_non_executed_scripts_manually(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-parse-files-in-dir=" + testbase.sources + "/tests/bash " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
-        # Not executed
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == 0
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 3) == 0
-
-class bash_can_ignore_non_executed_scripts(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/first-dir/a.sh 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/a.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "a.sh", 5) == 1
-        # Not included in report
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
-        assert parse_cobertura.hitsPerLine(dom, "other.sh", 3) == None
-
-class bash_can_ignore_function_with_spaces(testbase.KcovTestCase):
-    def runTest(self):
-        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/function-with-spaces.sh")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/function-with-spaces.sh/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 5) == None
-        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 6) == 1
-        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 9) == None
-        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 10) == None
-        assert parse_cobertura.hitsPerLine(dom, "function-with-spaces.sh", 11) == 1
diff --git a/kcov-38/tests/tools/bash_linux_only.py b/kcov-38/tests/tools/bash_linux_only.py
deleted file mode 100644
index c7a46f5fad93..000000000000
--- a/kcov-38/tests/tools/bash_linux_only.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import testbase
-import os
-import unittest
-import parse_cobertura
-
-class bash_sh_shebang(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-handle-sh-invocation " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "sh-shebang.sh", 4) == 1
diff --git a/kcov-38/tests/tools/basic.py b/kcov-38/tests/tools/basic.py
deleted file mode 100644
index d7ccda196644..000000000000
--- a/kcov-38/tests/tools/basic.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import testbase
-import unittest
-import parse_cobertura
-import os
-
-class TooFewArguments(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv, output = self.do(testbase.kcov + " " + testbase.outbase + "/kcov")
-        assert rv == 1
-
-class WrongArguments(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv, output = self.do(testbase.kcov + " --abc=efg " + testbase.outbase + "/kcov " + testbase.testbuild + "/tests-stripped")
-        assert rv == 1
-
-class LookupBinaryInPath(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        os.environ["PATH"] += testbase.sources + "/tests/python"
-        noKcovRv,o = self.do(testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + "main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 34) == 2
-        assert noKcovRv, rv
diff --git a/kcov-38/tests/tools/compiled.py b/kcov-38/tests/tools/compiled.py
deleted file mode 100644
index e4eb8f4c13e2..000000000000
--- a/kcov-38/tests/tools/compiled.py
+++ /dev/null
@@ -1,474 +0,0 @@
-import testbase
-import unittest
-import parse_cobertura
-import sys
-import os
-
-class illegal_insn(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        rv, output = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/illegal-insn", False)
-        assert rv != 0
-        assert b'Illegal instructions are' in output
-
-class fork_no_wait(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/fork_no_wait", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/fork_no_wait", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/fork_no_wait/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 20) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 22) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "fork-no-wait.c", 24) >= 1
-
-class ForkBase(testbase.KcovTestCase):
-    def doTest(self, binary):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/" + binary, False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/" + binary, False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/" + binary + "/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "fork.c", 21) == 0
-        assert parse_cobertura.hitsPerLine(dom, "fork.c", 26) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "fork.c", 34) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "fork.c", 37) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "fork.c", 46) >= 1
-
-class fork_64(ForkBase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.doTest("fork")
-
-class fork_32(ForkBase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.doTest("fork-32")
-
-class vfork(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/vfork", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/vfork/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "vfork.c", 12) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "vfork.c", 18) >= 1
-
-class shared_library(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/shared_library_test", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-
-class shared_library_skip(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --skip-solibs " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == None
-
-
-class shared_library_filter_out(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --exclude-pattern=solib " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == None
-
-
-class shared_library_accumulate(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #157")
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/shared_library_test 5", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shared_library_test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.c", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 10) == 1
-
-class MainTestBase(testbase.KcovTestCase):
-    def doTest(self, verify):
-        self.setUp()
-
-        noKcovRv,o = self.do(testbase.testbuild + "/main-tests", False)
-        rv,o = self.do(testbase.kcov + " " + verify + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests 5", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 14) == None
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 18) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 25) == 1
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 6) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "file2.c", 7) == 0
-
-
-class main_test(MainTestBase):
-    def runTest(self):
-        self.doTest("")
-
-class main_test_verify(MainTestBase):
-    def runTest(self):
-        self.doTest("--verify")
-
-class main_test_lldb_raw_breakpoints(MainTestBase):
-    def runTest(self):
-        self.doTest("--configure=lldb-use-raw-breakpoint-writes=1")
-
-class popen_test(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/test_popen", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_popen", False)
-        assert rv == noKcovRv
-
-        assert b"popen OK" in o
-
-class short_filename(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov ./s", False)
-        assert rv == 99
-
-
-class Pie(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/pie", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "pie.c", 5) == 1
-
-class pie_argv_basic(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 0
-
-class pie_accumulate(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 0
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/pie-test a", False)
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/pie-test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "argv-dependent.c", 11) == 1
-
-
-class global_ctors(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/global-constructors", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/global-constructors", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/global-constructors/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-global-ctors.cc", 4) >= 1
-
-class daemon_wait_for_last_child(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #158")
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/test_daemon", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_daemon", False)
-        assert rv == 4
-        assert noKcovRv == 2
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 1
-
-class SignalsBase(testbase.KcovTestCase):
-    def SignalsBase():
-        self.m_self = "";
-
-    def cmpOne(self, sig):
-        noKcovRv,o = self.do(testbase.testbuild + "/signals " + sig + " " + self.m_self, False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals " + sig + " " + self.m_self, False)
-        assert rv == noKcovRv
-
-        return parse_cobertura.parseFile(testbase.outbase + "/kcov/signals/cobertura.xml")
-
-    def doTest(self):
-        self.setUp()
-
-        dom = self.cmpOne("hup")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 14) == 1
-
-        dom = self.cmpOne("int")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 19) == 1
-
-        dom = self.cmpOne("quit")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 24) == 1
-
-        dom = self.cmpOne("bus")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 44) == 1
-
-        dom = self.cmpOne("fpe")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 49) == 1
-
-        dom = self.cmpOne("term")
-        assert parse_cobertura.hitsPerLine(dom, "test-signals.c", 84) == 1
-
-class signals(SignalsBase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX, Issue #158")
-
-    def runTest(self):
-        self.m_self = ""
-        self.doTest()
-
-class signals_self(SignalsBase):
-
-    def runTest(self):
-        self.m_self = "self"
-        self.doTest()
-
-class signals_crash(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals segv self", False)
-        assert b"kcov: Process exited with signal 11" in o
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/signals abrt self", False)
-        assert b"kcov: Process exited with signal 6" in o
-
-class collect_and_report_only(testbase.KcovTestCase):
-    # Cannot work with combined Engine / Parser
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/main-tests ", False)
-        rv,o = self.do(testbase.kcov + " --collect-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests", False)
-        assert rv == noKcovRv
-
-        try:
-            dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
-            self.fail("File unexpectedly found")
-        except:
-            # Exception is expected here
-            pass
-
-        rv,o = self.do(testbase.kcov + " --report-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-class setpgid_kill(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.testbuild + "/setpgid-kill", False)
-        assert b"SUCCESS" in o
-        rv,o = self.do(testbase.sources + "/tests/setpgid-kill/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/setpgid-kill", False)
-        assert b"SUCCESS" in o
-
-class attach_process_with_threads(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.sources + "/tests/daemon/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/issue31", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/issue31/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 28) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 11) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "test-issue31.cc", 9) == 0
-
-class attach_process_with_threads_creates_threads(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.sources + "/tests/daemon/test-script.sh " + testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/thread-test", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/thread-test/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "thread-main.c", 21) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "thread-main.c", 9) >= 1
-
-class merge_same_file_in_multiple_binaries(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_1", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/multi_1/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main_1.c", 10) == 0
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_2", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main_2.c", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 8) == 0
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/multi_2 1", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 3) == 0
-        assert parse_cobertura.hitsPerLine(dom, "file.c", 8) == 1
-
-
-class debuglink(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    def runTest(self):
-        self.setUp()
-        os.system("rm -rf %s/.debug" % (testbase.outbase))
-        os.system("cp %s/main-tests %s/main-tests-debug-file" % (testbase.testbuild, testbase.testbuild))
-        os.system("objcopy --only-keep-debug %s/main-tests-debug-file %s/main-tests-debug-file.debug" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file1.debug" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file12.debug" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file.debug %s/main-tests-debug-file123.debug" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file1" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file2" % (testbase.testbuild, testbase.testbuild))
-        os.system("cp %s/main-tests-debug-file %s/main-tests-debug-file3" % (testbase.testbuild, testbase.testbuild))
-        os.system("strip -g %s/main-tests-debug-file" % (testbase.testbuild))
-        os.system("strip -g %s/main-tests-debug-file1" % (testbase.testbuild))
-        os.system("strip -g %s/main-tests-debug-file2" % (testbase.testbuild))
-        os.system("strip -g %s/main-tests-debug-file3" % (testbase.testbuild))
-        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file.debug %s/main-tests-debug-file" % (testbase.testbuild, testbase.testbuild))
-        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file1.debug %s/main-tests-debug-file1" % (testbase.testbuild, testbase.testbuild))
-        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file12.debug %s/main-tests-debug-file2" % (testbase.testbuild, testbase.testbuild))
-        os.system("objcopy --add-gnu-debuglink=%s/main-tests-debug-file123.debug %s/main-tests-debug-file3" % (testbase.testbuild, testbase.testbuild))
-
-        noKcovRv,o = self.do(testbase.testbuild + "/main-tests-debug-file", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
-        assert rv == noKcovRv
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-        # Check alignment
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file1", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file1/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file2", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file2/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file3", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file3/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-        # Look in .debug
-        os.system("rm -rf %s/kcov" % (testbase.outbase))
-        os.system("mkdir -p %s/.debug" % (testbase.testbuild))
-        os.system("mv %s/main-tests-debug-file.debug %s/.debug" % (testbase.testbuild, testbase.testbuild))
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-
-        os.system("rm -rf %s/kcov" % (testbase.outbase))
-        os.system("echo 'abc' >> %s/.debug/main-tests-debug-file.debug" % (testbase.testbuild))
-
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-tests-debug-file", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-tests-debug-file/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == None
-	# Todo: Look in /usr/lib/debug as well
-
-class collect_no_source(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-
-        os.system("cp %s/tests/short-file.c %s/main.cc" % (testbase.sources, testbase.testbuild))
-        os.system("gcc -g -o %s/main-collect-only %s/main.cc" % (testbase.testbuild, testbase.testbuild))
-        os.system("mv %s/main.cc %s/tmp-main.cc" % (testbase.testbuild, testbase.testbuild))
-
-        rv,o = self.do(testbase.kcov + " --collect-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-collect-only", False)
-
-        os.system("mv %s/tmp-main.cc %s/main.cc" % (testbase.testbuild, testbase.testbuild))
-        rv,o = self.do(testbase.kcov + " --report-only " + testbase.outbase + "/kcov " + testbase.testbuild + "/main-collect-only")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main-collect-only/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 1) == 1
-
-class dlopen(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/dlopen", False)
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.testbuild + "/dlopen", False)
-
-        assert noKcovRv == rv
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dlopen/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "dlopen.cc", 11) == 1
-        assert parse_cobertura.hitsPerLine(dom, "dlopen.cc", 12) == 0
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 12) == 0
-
-
-class dlopen_in_ignored_source_file(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --exclude-pattern=dlopen.cc " + testbase.outbase + "/kcov " + testbase.testbuild + "/dlopen", False)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/dlopen/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "dlopen-main.cc", 10) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "solib.c", 12) == 0
-
-class daemon_no_wait_for_last_child(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.testbuild + "/test_daemon", False)
-        rv,o = self.do(testbase.kcov + " --output-interval=1 --exit-first-process " + testbase.outbase + "/kcov " + testbase.testbuild + "/test_daemon", False)
-
-        assert noKcovRv == rv
-        time.sleep(2)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 0
-
-        time.sleep(5)
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/test_daemon/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "test-daemon.cc", 31) == 1
-
-
-class address_sanitizer_coverage(testbase.KcovTestCase):
-    @unittest.skipIf(sys.platform.startswith("darwin"), "Not for OSX")
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        if (not os.path.isfile(testbase.testbuild + "/sanitizer-coverage")):
-            print("Clang-only")
-            assert False
-        rv,o = self.do(testbase.kcov + " --clang " + testbase.outbase + "/kcov " + testbase.testbuild + "/sanitizer-coverage", False)
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/sanitizer-coverage/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 5) == 1
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 7) == 1
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 8) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 16) == 1
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 18) == 1
-
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 22) == 0
-        assert parse_cobertura.hitsPerLine(dom, "sanitizer-coverage.c", 25) == 0
diff --git a/kcov-38/tests/tools/dummy-python.sh b/kcov-38/tests/tools/dummy-python.sh
deleted file mode 100755
index cb7288c265fc..000000000000
--- a/kcov-38/tests/tools/dummy-python.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 99
diff --git a/kcov-38/tests/tools/filter.py b/kcov-38/tests/tools/filter.py
deleted file mode 100644
index 4a80eee032f8..000000000000
--- a/kcov-38/tests/tools/filter.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import testbase
-import unittest
-import parse_cobertura
-
-class include_exclude_pattern(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --exclude-pattern=first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
-
-        rv,o = self.do(testbase.kcov + " --include-pattern=first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
-
-        rv,o = self.do(testbase.kcov + " --include-pattern=first-dir --exclude-pattern=c.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) == None
-        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) >= 1
-
-
-class include_path(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --include-path=" + testbase.sources + "/tests/bash/first-dir " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) >= 1
-
-class include_path_and_exclude_pattern(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --bash-dont-parse-binary-dir --include-path=" + testbase.sources + "/tests/bash/first-dir --exclude-pattern=b.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/bash/shell-main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/shell-main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "shell-main", 29) == None
-        assert parse_cobertura.hitsPerLine(dom, "c.sh", 3) >= 1
-        assert parse_cobertura.hitsPerLine(dom, "b.sh", 3) == None
diff --git a/kcov-38/tests/tools/parse_cobertura.py b/kcov-38/tests/tools/parse_cobertura.py
deleted file mode 100755
index 9fdd8ee1be1b..000000000000
--- a/kcov-38/tests/tools/parse_cobertura.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import xml.dom.minidom
-
-#all these imports are standard on most modern python implementations
-
-def readFile(name):
-    f = open(name,'r')
-    data = f.read()
-    f.close()
-
-    return data
-
-
-def lookupClassName(dom, name):
-    tags = dom.getElementsByTagName('class')
-
-    for tag in tags:
-        nameAttr = tag.attributes["name"]
-        if nameAttr.value == name:
-            return tag
-
-    return None
-
-def lookupHitsByLine(classTag, lineNr):
-    tags = classTag.getElementsByTagName('line')
-
-    for tag in tags:
-        numberAttr = tag.attributes["number"]
-        if int(numberAttr.value) == int(lineNr):
-            hitsAttr = tag.attributes["hits"]
-            return int(hitsAttr.value)
-
-    return None
-
-
-def parse(data):
-    #parse the xml you got from the file
-    dom = xml.dom.minidom.parseString(data)
-
-    return dom
-
-def parseFile(filename):
-    #parse the xml you got from the file
-    dom = xml.dom.minidom.parseString(readFile(filename))
-
-    return dom
-
-def hitsPerLine(dom, fileName, lineNr):
-    fileName = fileName.replace(".", "_").replace("-", "_")
-
-    fileTag = lookupClassName(dom, fileName)
-
-    if fileTag != None:
-        hits = lookupHitsByLine(fileTag, lineNr)
-        if hits != None:
-            return hits
-
-    return None
-
-if __name__ == "__main__":
-    if len(sys.argv) < 4:
-        print("Usage: lookup-class-line <in-file> <filename> <lineNr>")
-        sys.exit(1)
-
-
-    fileName = sys.argv[2]
-    line = int(sys.argv[3])
-
-    data = readFile(sys.argv[1])
-
-    dom = parse(data)
-    fileTag = lookupClassName(dom, fileName)
-
-    if fileTag != None:
-        hits = lookupHitsByLine(fileTag, line)
-        if hits != None:
-            print(hits)
-            sys.exit(0)
-
-    print("nocode")
diff --git a/kcov-38/tests/tools/python.py b/kcov-38/tests/tools/python.py
deleted file mode 100644
index eee81a11ce8f..000000000000
--- a/kcov-38/tests/tools/python.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import testbase
-import unittest
-import parse_cobertura
-
-class python_exit_status(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        noKcovRv,o = self.do(testbase.sources + "/tests/python/main 5")
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        assert rv == noKcovRv
-
-class python_can_set_illegal_parser(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --python-parser=python7 " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        assert b"Cannot find Python parser 'python7'" in o
-
-class python_can_set_legal_parser(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --python-parser=python3 " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        assert b"Cannot find Python parser 'python3'" not in o
-
-class python_unittest(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/unittest/testdriver")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/testdriver/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "testdriver", 14) == 1
-
-class python_short_file(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/short-test.py")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/short-test.py/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "short-test.py", 6) == 1
-
-class PythonBase(testbase.KcovTestCase):
-    def doTest(self, extra):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + extra + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 10) == 2
-        assert parse_cobertura.hitsPerLine(dom, "main", 17) == 0
-        assert parse_cobertura.hitsPerLine(dom, "main", 22) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 2) == 1
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 4) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 11) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 31) == 0
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 38) == 1
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 39) == 0
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 40) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 41) == 1
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 56) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 60) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 65) == None
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 77) == None
-
-class python_coverage(PythonBase):
-    def runTestTest(self):
-        self.doTest("")
-
-class python_accumulate_data(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 0
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
-
-
-class python3_coverage(PythonBase):
-    def runTest(self):
-        self.doTest("--python-parser=python3")
-
-class python_tricky_single_line_string_assignment(testbase.KcovTestCase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 34) == 2
-
-class python_select_parser(testbase.KcovTestCase):
-    def disabledTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --python-parser=" + testbase.sources + "/tests/tools/dummy-python.sh " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        assert rv == 99
-
-class python_tricky_single_dict_assignment(testbase.KcovTestCase):
-    @unittest.expectedFailure
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " " + testbase.outbase + "/kcov " + testbase.sources + "/tests/python/main 5")
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 57) == 1
-        assert parse_cobertura.hitsPerLine(dom, "second.py", 61) == 1
diff --git a/kcov-38/tests/tools/run-tests b/kcov-38/tests/tools/run-tests
deleted file mode 100755
index 58a3119fa0df..000000000000
--- a/kcov-38/tests/tools/run-tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import unittest
-import testbase
-
-# The actual tests
-from basic import *
-from compiled import *
-if sys.platform.startswith("linux"):
-    from bash_linux_only import *
-    from system_mode import *
-from filter import *
-from accumulate import *
-from python import *
-from bash import *
-
-if __name__ == "__main__":
-    if len(sys.argv) < 5:
-        print("Usage: run-tests <path-to-kcov-binary> <kcov-output> <path-to-test-builds> <path-to-kcov-source>")
-        sys.exit(1)
-
-    testbase.configure(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
-
-    sys.argv = sys.argv[4:]
-
-    unittest.main()
diff --git a/kcov-38/tests/tools/system_mode.py b/kcov-38/tests/tools/system_mode.py
deleted file mode 100644
index 6831dbbdd043..000000000000
--- a/kcov-38/tests/tools/system_mode.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import testbase
-import os
-import time
-import unittest
-import platform
-import parse_cobertura
-
-class SystemModeBase(testbase.KcovTestCase):
-    def writeToPipe(self, str):
-        f = open("/tmp/kcov-system.pipe", "w")
-        f.write(str)
-        f.close()
-
-class system_mode_can_start_and_stop_daemon(SystemModeBase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov_system_daemon + " -d", False)
-
-        pf = "/tmp/kcov-system.pid"
-        assert os.path.isfile(pf)
-
-        self.writeToPipe("STOPME")
-
-        time.sleep(2)
-
-        assert os.path.isfile(pf) == False
-
-class system_mode_can_instrument_binary(SystemModeBase):
-    def runTest(self):
-        self.setUp()
-        rv,o = self.do(testbase.kcov + " --system-record " + testbase.outbase + "/kcov " + testbase.testbuild + "/")
-        assert rv == 0
-
-        src = testbase.testbuild + "/main-tests"
-        dst = testbase.outbase + "/kcov/main-tests"
-
-        assert os.path.isfile(src)
-        assert os.path.isfile(dst)
-
-        assert os.path.getsize(dst) > os.path.getsize(src)
-
-class system_mode_can_record_and_report_binary(SystemModeBase):
-    @unittest.skipIf(platform.machine() == "i686", "x86_64-only")
-    def runTest(self):
-        print(platform.machine())
-        self.setUp()
-        try:
-            os.makedirs(testbase.outbase + "/kcov")
-        except:
-            pass
-        rv,o = self.do(testbase.kcov + " --system-record " + testbase.outbase + "/kcov " + testbase.testbuild + "/")
-
-        rv,o = self.do(testbase.kcov_system_daemon + " -d", False)
-
-        os.environ["LD_LIBRARY_PATH"] = testbase.outbase + "/kcov/lib"
-        rv,o = self.do(testbase.outbase + "/kcov/main-tests", False)
-        assert rv == 0
-
-        time.sleep(3)
-        self.writeToPipe("STOPME")
-
-        rv,o = self.do(testbase.kcov + " --system-report " + testbase.outbase + "/kcov-report /tmp/kcov-data")
-        assert rv == 0
-
-        dom = parse_cobertura.parseFile(testbase.outbase + "/kcov-report/main-tests/cobertura.xml")
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 9) == 1
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 14) == None
-        assert parse_cobertura.hitsPerLine(dom, "main.cc", 18) >= 1
diff --git a/kcov-38/tests/tools/testbase.py b/kcov-38/tests/tools/testbase.py
deleted file mode 100644
index d70ecc8b6ab0..000000000000
--- a/kcov-38/tests/tools/testbase.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-import os
-import sys
-import subprocess
-import time
-import threading
-
-kcov = ""
-kcov_system_daemon = ""
-outbase = ""
-testbuild = ""
-sources = ""
-
-def configure(k, o, t, s):
-    global kcov, outbase, testbuild, sources, kcov_system_daemon
-    kcov = k
-    kcov_system_daemon = k + "-system-daemon"
-    outbase = o
-    testbuild = t
-    sources = s
-
-class KcovTestCase(unittest.TestCase):
-    def setUp(self):
-        if outbase != "":
-            os.system("rm -rf %s/kcov" % (outbase))
-        os.system("mkdir -p %s/kcov/" % (outbase))
-
-    def doShell(self, cmdline):
-        child = subprocess.Popen(cmdline, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = child.communicate()
-        output = out + err
-        rv = child.returncode
-
-        return rv, output
-
-    def do(self, cmdline, kcovKcov = True, timeout = None):
-        output = ""
-        rv = 0
-
-        extra = ""
-        if kcovKcov and sys.platform.startswith("linux"):
-            extra = kcov + " --include-pattern=kcov --exclude-pattern=helper.cc,library.cc,html-data-files.cc " + outbase + "/kcov-kcov "
-
-
-        cmdline = extra + cmdline
-        child = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        timer = None
-
-        if timeout is not None:
-            def stopChild():
-                print("\n  didn't finish within %s seconds; killing ..." % timeout)
-                child.terminate()
-
-            timer = threading.Timer(timeout, stopChild)
-            timer.start()
-
-        out, err = child.communicate()
-        if timer is not None:
-            timer.cancel()
-        output = out + err
-        rv = child.returncode
-
-        return rv, output
diff --git a/kcov-38/tests/unit-tests/CMakeLists.txt b/kcov-38/tests/unit-tests/CMakeLists.txt
deleted file mode 100644
index 979cc356a9c7..000000000000
--- a/kcov-38/tests/unit-tests/CMakeLists.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-cmake_minimum_required (VERSION 2.8.4)
-project (kcov-unit-tests)
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
-
-if (POLICY CMP0042)
-    # MACOSX_RPATH is enabled by default.
-    cmake_policy (SET CMP0042 NEW)
-endif (POLICY CMP0042)
-
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set (CMAKE_BUILD_TYPE Debug CACHE STRING
-        "Choose the type of build, options are None Debug Release RelWithDebInfo MinSizeRel"
-        FORCE
-    )
-    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY
-        STRINGS None Debug Release RelWithDebInfo MinSizeRel
-    )
-endif (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
-find_package (LibCRPCUT REQUIRED)
-find_package (LibElf REQUIRED)
-find_package (Elfutils REQUIRED)
-
-set (CMAKE_THREAD_PREFER_PTHREAD ON)
-find_package (Threads REQUIRED)
-
-find_package (ZLIB REQUIRED)
-
-find_library (DL_LIBRARY NAMES dl)
-if (DL_LIBRARY)
-    message (STATUS "Found DL: ${DL_LIBRARY}")
-else (DL_LIBRARY)
-    message (FATAL_ERROR "Could NOT find DL")
-endif (DL_LIBRARY)
-
-set (TGT ut)
-
-set (${TGT}_SRCS
-    ../../src/capabilities.cc
-    ../../src/collector.cc
-    ../../src/engine-factory.cc
-    ../../src/engines/system-mode-file-format.cc
-    ../../src/gcov.cc
-    ../../src/output-handler.cc
-    ../../src/parser-manager.cc
-    ../../src/source-file-cache.cc
-    ../../src/system-mode/registration.cc
-    ../../src/system-mode/file-data.cc
-    ../../src/utils.cc
-    ../../src/writers/cobertura-writer.cc
-    ../../src/writers/html-writer.cc
-    ../../src/writers/writer-base.cc
-    main.cc
-    tests-collector.cc
-    tests-configuration.cc
-    tests-elf.cc
-    tests-filter.cc
-    tests-reporter.cc
-    tests-system-mode.cc
-    tests-utils.cc
-    tests-writer.cc
-)
-
-set (CMAKE_CXX_FLAGS "-std=c++1y -Wall -D_GLIBCXX_USE_NANOSLEEP")
-
-
-add_custom_command(OUTPUT html-data-files.cc
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../src/bin-to-c-source.py"
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/bcov.css" css_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/amber.png" icon_amber
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/glass.png" icon_glass
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/source-file.html" source_file_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/index.html" index_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/handlebars.js" handlebars_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/kcov.js" kcov_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.min.js" jquery_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.min.js" tablesorter_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.widgets.min.js" tablesorter_widgets_text
-            "${CMAKE_CURRENT_SOURCE_DIR}/../../data/tablesorter-theme.css" tablesorter_theme_text
-       > html-data-files.cc
-    DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/bcov.css"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/amber.png"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/glass.png"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/source-file.html"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/index.html"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/handlebars.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/kcov.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/js/jquery.tablesorter.widgets.min.js"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../data/tablesorter-theme.css"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../src/bin-to-c-source.py"
-)
-
-include_directories(
-    ../../src/include/
-    trompeloeil/include
-    ${LIBCRPCUT_INCLUDE_DIRS}
-    ${LIBELF_INCLUDE_DIRS}
-    ${LIBDW_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
-add_executable (${TGT} ${${TGT}_SRCS} html-data-files.cc)
-
-target_link_libraries(${TGT}
-    ${CMAKE_THREAD_LIBS_INIT}
-    "${DL_LIBRARY}"
-    ${LIBCRPCUT_LIBRARIES}
-    ${LIBDW_LIBRARIES}
-    ${LIBELF_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-)
-
-add_executable (same-name-test
-    ../main.cc
-    ../subdir/file.c
-    ../subdir2/file.c
-)
-
-add_executable (test-binary test-source.c second-source.c)
-set_target_properties(test-binary PROPERTIES
-    COMPILE_FLAGS "-nostdinc"
-    LINK_FLAGS "-nostdlib"
-)
diff --git a/kcov-38/tests/unit-tests/main.cc b/kcov-38/tests/unit-tests/main.cc
deleted file mode 100644
index 03e2f6558b95..000000000000
--- a/kcov-38/tests/unit-tests/main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "test.hh"
-#include "mocks/mock-engine.hh"
-
-using namespace kcov;
-
-const char *kcov_version = "0";
-
-int main(int argc, const char *argv[])
-{
-	return crpcut::run(argc, argv);
-}
diff --git a/kcov-38/tests/unit-tests/mocks/mock-collector.hh b/kcov-38/tests/unit-tests/mocks/mock-collector.hh
deleted file mode 100644
index 17aaf400b6cd..000000000000
--- a/kcov-38/tests/unit-tests/mocks/mock-collector.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "../test.hh"
-
-#include <collector.hh>
-#include <string>
-
-class MockCollector : public kcov::ICollector
-{
-public:
-	MAKE_MOCK1(registerListener, void(kcov::ICollector::IListener &listener));
-	MAKE_MOCK1(registerEventTickListener, void(kcov::ICollector::IEventTickListener &listener));
-	MAKE_MOCK0(prepare, int());
-	MAKE_MOCK1(run, int(const std::string &));
-	MAKE_MOCK0(stop, void());
-
-	void mockRegisterListener(IListener &listener)
-	{
-		m_listener = &listener;
-	}
-
-	IListener *m_listener;
-};
diff --git a/kcov-38/tests/unit-tests/mocks/mock-engine.hh b/kcov-38/tests/unit-tests/mocks/mock-engine.hh
deleted file mode 100644
index 9c8f93a70a6a..000000000000
--- a/kcov-38/tests/unit-tests/mocks/mock-engine.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "../test.hh"
-
-#include <engine.hh>
-
-using namespace kcov;
-
-
-class MockEngine : public IEngine
-{
-public:
-	MockEngine()
-	{
-	}
-
-	MAKE_MOCK1(registerBreakpoint, int(unsigned long addr));
-	MAKE_MOCK2(start, bool(IEventListener &listener, const std::string &executable));
-	MAKE_MOCK0(continueExecution, bool());
-	MAKE_MOCK1(kill, void(int));
-
-	unsigned int matchFile(const std::string &filename, uint8_t *data, size_t dataSize)
-	{
-		return match_perfect;
-	}
-};
diff --git a/kcov-38/tests/unit-tests/mocks/mock-reporter.hh b/kcov-38/tests/unit-tests/mocks/mock-reporter.hh
deleted file mode 100644
index ba0f3c7f18c4..000000000000
--- a/kcov-38/tests/unit-tests/mocks/mock-reporter.hh
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <reporter.hh>
-
-namespace kcov
-{
-	class MockReporter : public IReporter
-	{
-	public:
-		MAKE_MOCK1(fileIsIncluded,
-				bool(const std::string &file));
-
-		MAKE_MOCK2(lineIsCode,
-				bool(const std::string &file, unsigned int lineNr));
-
-		MAKE_MOCK2(getLineExecutionCount,
-				LineExecutionCount(const std::string &file, unsigned int lineNr));
-
-		MAKE_MOCK0(getExecutionSummary,
-				ExecutionSummary());
-
-		MAKE_MOCK1(registerListener, void(kcov::IReporter::IListener &listener));
-
-		MAKE_MOCK1(marshal, void *(size_t *szOut));
-
-		MAKE_MOCK2(unMarshal, bool(void *data, size_t sz));
-
-		MAKE_MOCK0(writeCoverageDatabase, void());
-
-		void *mockMarshal(size_t *outSz)
-		{
-			void *out = malloc(32);
-
-			*outSz = 32;
-
-			return out;
-		}
-	};
-}
diff --git a/kcov-38/tests/unit-tests/second-source.c b/kcov-38/tests/unit-tests/second-source.c
deleted file mode 100644
index 6f033d760a21..000000000000
--- a/kcov-38/tests/unit-tests/second-source.c
+++ /dev/null
@@ -1,8 +0,0 @@
-int mibb(int a)
-{
-	// "Hej" and 'hej' means HTML escaping! \ is another escape
-	if (a < 5 && a > 3)
-		return 0;
-
-	return a - 1;
-}
diff --git a/kcov-38/tests/unit-tests/test-source.c b/kcov-38/tests/unit-tests/test-source.c
deleted file mode 100644
index e47c5c187cb1..000000000000
--- a/kcov-38/tests/unit-tests/test-source.c
+++ /dev/null
@@ -1,20 +0,0 @@
-// Small dummy test program to keep the addresses few!
-int kalle(int a, int b)
-{
-	if (a == 15)
-		return 1;
-
-	// Should be two blocks
-	if (a == 10 && b == 19)
-		return 2;
-
-	return 0;
-}
-
-void _start(int a, int b)
-{
-	if (kalle(a, b))
-		return;
-
-	kalle(9, 5);
-}
diff --git a/kcov-38/tests/unit-tests/test.hh b/kcov-38/tests/unit-tests/test.hh
deleted file mode 100644
index af0759c7281d..000000000000
--- a/kcov-38/tests/unit-tests/test.hh
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "trompeloeil.hpp"
-#include <crpcut.hpp>
-
-using trompeloeil::_;
diff --git a/kcov-38/tests/unit-tests/tests-collector.cc b/kcov-38/tests/unit-tests/tests-collector.cc
deleted file mode 100644
index d0a373c76486..000000000000
--- a/kcov-38/tests/unit-tests/tests-collector.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "test.hh"
-#include "mocks/mock-engine.hh"
-
-#include <file-parser.hh>
-#include <collector.hh>
-#include <filter.hh>
-#include <utils.hh>
-
-#include <string>
-
-using namespace kcov;
-
-class MockCollectorListener : public ICollector::IListener
-{
-public:
-	virtual ~MockCollectorListener()
-	{
-	}
-
-	MAKE_MOCK2(onAddressHit, void(uint64_t addr, unsigned long hits));
-};
-
-DISABLED_TEST(collector)
-{
-	MockEngine engine;
-	MockCollectorListener listener;
-	IFileParser *elf;
-	char filename[1024];
-	bool res;
-
-	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(elf);
-
-	ICollector &collector = ICollector::create(*elf, engine, IFilter::create());
-
-	collector.registerListener(listener);
-
-	REQUIRE_CALL(engine, registerBreakpoint(_))
-		.TIMES(AT_LEAST(1))
-		.RETURN(0)
-		;
-
-	res = elf->parse();
-	ASSERT_TRUE(res);
-
-	int v;
-
-	REQUIRE_CALL(engine, start(_,_))
-		.TIMES(1)
-		.RETURN(true)
-		;
-
-	IEngine::Event evExit, evOnce;
-
-	evExit.addr = 0;
-	evExit.type = ev_exit;
-	evExit.data = 1;
-
-	evOnce.addr = 1;
-	evOnce.type = ev_breakpoint;
-	evOnce.data = 1;
-
-	REQUIRE_CALL(listener, onAddressHit(1, _))
-		.TIMES(1)
-		;
-
-	v = collector.run(filename);
-
-	ASSERT_EQ(v, evExit.data);
-
-	evOnce.type = ev_error;
-
-	// Test error
-	REQUIRE_CALL(engine, start(_,_))
-		.TIMES(1)
-		.RETURN(0)
-		;
-
-	REQUIRE_CALL(engine, continueExecution())
-		.TIMES(1)
-		.RETURN(true)
-		;
-	v = collector.run(filename);
-
-	ASSERT_EQ(v, -1);
-}
diff --git a/kcov-38/tests/unit-tests/tests-configuration.cc b/kcov-38/tests/unit-tests/tests-configuration.cc
deleted file mode 100644
index 456b7b9ca7e3..000000000000
--- a/kcov-38/tests/unit-tests/tests-configuration.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-#include "test.hh"
-
-#include <configuration.hh>
-#include <utils.hh>
-
-#include "../../src/configuration.cc"
-
-static bool runParse(std::string args)
-{
-	char *p = strdup(args.c_str());
-	char *cur;
-	std::list<std::string> argList;
-
-	argList.push_back(std::string(crpcut::get_start_dir()) + "/test-binary");
-
-	cur = strtok(p, " ");
-	while (cur)
-	{
-		argList.push_back(std::string(cur));
-		cur = strtok(NULL, " ");
-	}
-	free((void *)p);
-
-	const char **argv = (const char **)malloc(argList.size() * sizeof(const char*));
-
-	int i = 0;
-	for (std::list<std::string>::iterator it = argList.begin();
-			it != argList.end();
-			it++)
-	{
-		// Yes, these are memory leaks.
-		argv[i] = strdup((*it).c_str());
-		i++;
-	}
-
-	return IConfiguration::getInstance().parse(argList.size(), argv);
-}
-
-TESTSUITE(configuration)
-{
-	DISABLED_TEST(basic)
-	{
-		std::string filename = std::string(crpcut::get_start_dir()) + "/test-binary";
-
-		Configuration *conf = &(Configuration &)Configuration::getInstance();
-		ASSERT_TRUE(conf);
-
-
-		bool res = runParse(fmt("/tmp/vobb %s tjena", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		const char **a = conf->getArgv();
-		ASSERT_TRUE(filename == a[0]);
-		ASSERT_TRUE(std::string("tjena") == a[1]);
-
-		ASSERT_TRUE(conf->keyAsString("binary-name") == "test-binary");
-		ASSERT_TRUE(conf->keyAsString("binary-path") == std::string(crpcut::get_start_dir()) + "/");
-
-		res = runParse("-h");
-		ASSERT_FALSE(res);
-
-		res = runParse("-s vbb");
-		ASSERT_FALSE(res);
-
-		ASSERT_TRUE(conf->keyAsInt("low-limit") == 25);
-		ASSERT_TRUE(conf->keyAsInt("high-limit")== 75U);
-
-		res = runParse(fmt("-l 30,60 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		ASSERT_TRUE(conf->keyAsInt("low-limit")== 30);
-		ASSERT_TRUE(conf->keyAsInt("high-limit") == 60);
-
-		res = runParse(fmt("-l 20 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(!res);
-
-		res = runParse(fmt("-l 40,50,90 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(!res);
-
-		res = runParse(fmt("-l 35,hej /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(!res);
-
-		res = runParse(fmt("-l yo,89 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(!res);
-
-		res = runParse(fmt("/tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		res = runParse(fmt("/tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		res = runParse(fmt("--path-strip-level=ejNummer /tmp/vobb, %s", filename.c_str()));
-		ASSERT_FALSE(res);
-
-		res = runParse(fmt("--path-strip-level=3 /tmp/vobb, %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		res = runParse(fmt("--include-path=/a,/b/c --exclude-pattern=d/e/f /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		ASSERT_TRUE(conf->keyAsList("include-path").size() == 2U);
-		ASSERT_TRUE(conf->keyAsList("include-path")[0] == "/a");
-		ASSERT_TRUE(conf->keyAsList("include-path")[1] == "/b/c");
-
-		ASSERT_TRUE(conf->keyAsList("exclude-pattern").size() == 1U);
-		ASSERT_TRUE(conf->keyAsList("exclude-pattern")[0] == "d/e/f");
-		
-		res = runParse(fmt("--strip-path=path"));
-		ASSERT_TRUE(res);
-		
-		ASSERT_TRUE(conf->keyAsString("strip-path") == "path");
-
-		res = runParse(fmt("--include-path=~/a /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		ASSERT_TRUE(conf->keyAsList("include-path").size() == 1U);
-		ASSERT_TRUE(conf->keyAsList("include-path")[0] == fmt("%s/a", get_home()));
-
-		ASSERT_TRUE(conf->keyAsInt("attach-pid") == 0U);
-		res = runParse(fmt("-p ejNummer /tmp/vobb %s", filename.c_str()));
-		ASSERT_FALSE(res);
-
-		res = runParse(fmt("-p 10 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		res = runParse(fmt("--pid=100 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-		ASSERT_TRUE(conf->keyAsInt("attach-pid") == 100U);
-
-		ASSERT_TRUE(g_kcov_debug_mask == STATUS_MSG);
-		res = runParse(fmt("--debug=7 /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-		ASSERT_TRUE(g_kcov_debug_mask == 7);
-
-		res = runParse(fmt("--exclude-pattern=a /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-
-		auto ep = conf->keyAsList("exclude-pattern");
-		ASSERT_TRUE(ep.size() == 1);
-		ASSERT_TRUE(ep[0] == "a");
-
-		res = runParse(fmt("--include-pattern=a,b,c /tmp/vobb %s", filename.c_str()));
-		ASSERT_TRUE(res);
-		ep = conf->keyAsList("include-pattern");
-		ASSERT_TRUE(ep.size() == 3);
-		ASSERT_TRUE(ep[0] == "a");
-		ASSERT_TRUE(ep[1] == "b");
-		ASSERT_TRUE(ep[2] == "c");
-	}
-}
diff --git a/kcov-38/tests/unit-tests/tests-elf.cc b/kcov-38/tests/unit-tests/tests-elf.cc
deleted file mode 100644
index bfedc9ddb387..000000000000
--- a/kcov-38/tests/unit-tests/tests-elf.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "test.hh"
-
-#include <file-parser.hh>
-#include <utils.hh>
-
-#include <string>
-#include <string.h>
-
-#include <map>
-
-using namespace kcov;
-
-class FunctionListener : public IFileParser::ILineListener
-{
-public:
-
-	virtual void onLine(const std::string &file, unsigned int lineNr,
-			uint64_t addr)
-	{
-		m_lineMap[constructString(file, lineNr)]++;
-	}
-
-	static std::string constructString(const std::string &file, int nr)
-	{
-		const char *p = file.c_str();
-		char *c_str = (char *)xmalloc(file.size() + 20);
-		const char *name = strrchr(p, '/');
-
-		ASSERT_TRUE(name);
-
-		sprintf(c_str, "%s:%d", name, nr);
-
-		std::string out(c_str);
-		free(c_str);
-
-		return out;
-	}
-
-	std::map<std::string, int> m_lineMap;
-};
-
-DISABLED_TEST(elf, DEADLINE_REALTIME_MS(30000))
-{
-	FunctionListener listener;
-	char filename[1024];
-	bool res;
-
-	IFileParser *elf = IParserManager::getInstance().matchParser("not-found");
-	ASSERT_TRUE(!elf);
-
-	sprintf(filename, "%s/Makefile", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(!elf);
-
-	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(elf);
-
-	elf->registerLineListener(listener);
-
-	res = elf->addFile(filename);
-	ASSERT_TRUE(res == true);
-	res = elf->parse();
-	ASSERT_TRUE(res == true);
-
-	std::string str = FunctionListener::constructString("/test-source.c", 8);
-	ASSERT_TRUE(listener.m_lineMap[str] > 0);
-}
diff --git a/kcov-38/tests/unit-tests/tests-filter.cc b/kcov-38/tests/unit-tests/tests-filter.cc
deleted file mode 100644
index ce3dcab42026..000000000000
--- a/kcov-38/tests/unit-tests/tests-filter.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "test.hh"
-
-#include <configuration.hh>
-#include "../../src/filter.cc"
-
-using namespace kcov;
-
-TEST(filter)
-{
-	std::string filename = std::string(crpcut::get_start_dir()) + "/test-binary";
-
-	IConfiguration &conf = IConfiguration::getInstance();
-	Filter &filter = (Filter &)IFilter::create();
-	bool res;
-	const char *argv[] = {NULL, "/tmp/vobb", filename.c_str(), "tjena"};
-	res = conf.parse(4, argv);
-	ASSERT_TRUE(res);
-	filter.setup();
-
-	res = filter.runFilters("");
-	ASSERT_TRUE(res);
-	res = filter.runFilters(filename);
-	ASSERT_TRUE(res);
-
-
-	const char *argv2[] = {NULL, "--include-pattern=test-bin", "/tmp/vobb", filename.c_str(), "tjena"};
-	res = conf.parse(5, argv2);
-	ASSERT_TRUE(res);
-	filter.setup();
-
-	res = filter.runFilters(filename);
-	ASSERT_TRUE(res);
-	res = filter.runFilters("ingenting");
-	ASSERT_FALSE(res);
-
-
-	const char *argv3[] = {NULL, "--exclude-pattern=hej,hopp", "--include-pattern=bin", "/tmp/vobb", filename.c_str(), "tjena"};
-	res = conf.parse(5, argv3);
-	ASSERT_TRUE(res);
-	filter.setup();
-
-	res = filter.runFilters("binary");
-	ASSERT_TRUE(res);
-	res = filter.runFilters("hopp/binary");
-	ASSERT_FALSE(res);
-	res = filter.runFilters("hej/binary");
-	ASSERT_FALSE(res);
-	res = filter.runFilters("varken-eller");
-	ASSERT_FALSE(res);
-
-	std::string ip = std::string("--include-path=") + crpcut::get_start_dir();
-	const char *argv4[] = {NULL,
-			ip.c_str(),
-			"/tmp/vobb",
-			filename.c_str(), "tjena"};
-	res = conf.parse(5, argv4);
-	ASSERT_TRUE(res);
-	filter.setup();
-
-	res = filter.runFilters(crpcut::get_start_dir());
-	ASSERT_TRUE(res);
-	res = filter.runFilters(filename);
-	ASSERT_TRUE(res);
-	res = filter.runFilters("hejsan-hoppsan");
-	ASSERT_FALSE(res);
-
-	std::string ep = std::string("--exclude-path=") + crpcut::get_start_dir();
-	const char *argv5[] = {NULL,
-			ep.c_str(),
-			"/tmp/vobb",
-			filename.c_str(), "tjena"};
-	res = conf.parse(5, argv5);
-	ASSERT_TRUE(res);
-	filter.setup();
-
-	res = filter.runFilters(crpcut::get_start_dir());
-	ASSERT_FALSE(res);
-	res = filter.runFilters(std::string(crpcut::get_start_dir()) + "/svenne");
-	ASSERT_FALSE(res);
-	res = filter.runFilters("/tmp");
-	ASSERT_TRUE(res);
-
-	res = filter.runLineFilters("Kalle", 15, "Inget speciellt");
-	ASSERT_TRUE(res);
-}
diff --git a/kcov-38/tests/unit-tests/tests-merge-parser.cc b/kcov-38/tests/unit-tests/tests-merge-parser.cc
deleted file mode 100644
index e839fbdd8ffd..000000000000
--- a/kcov-38/tests/unit-tests/tests-merge-parser.cc
+++ /dev/null
@@ -1,312 +0,0 @@
-#include "test.hh"
-
-#include "mocks/mock-reporter.hh"
-#include "../../src/merge-file-parser.cc"
-
-#include <utils.hh>
-#include <string>
-#include <vector>
-
-class MockParser : public IFileParser
-{
-public:
-	MAKE_MOCK2(addFile, bool(const std::string &filename, struct phdr_data_entry *phdr_data));
-	MAKE_MOCK1(registerLineListener, void(ILineListener &listener));
-	MAKE_MOCK1(registerFileListener, void(IFileListener &listener));
-	MAKE_MOCK0(parse, bool());
-	MAKE_MOCK0(getChecksum, uint64_t());
-	MAKE_MOCK0(getParserType, std::string());
-	MAKE_MOCK1(setupParser, void(IFilter *));
-	MAKE_MOCK0(maxPossibleHits, enum IFileParser::PossibleHits());
-	MAKE_MOCK3(matchParser, unsigned int(const std::string &filename, uint8_t *mock_data, size_t dataSize));
-};
-
-static bool mocked_file_exists(const std::string &path)
-{
-	return true;
-}
-
-
-static std::vector<uint8_t> mock_data;
-static void *mocked_read_file(size_t *out_size, const char *path)
-{
-	*out_size = mock_data.size();
-
-	void *p = xmalloc(*out_size);
-	memcpy(p, mock_data.data(), *out_size);
-
-	return p;
-}
-
-static std::unordered_map<std::string, std::string> path_to_data;
-static int mocked_write_file(const void *data, size_t size, const char *path)
-{
-	path_to_data[path] = std::string((const char *)data);
-
-	return 0;
-}
-
-static uint64_t mocked_ts;
-static uint64_t mocked_get_timestamp(const std::string &filename)
-{
-	return mocked_ts;
-}
-
-class LineListenerFixture : public IFileParser::ILineListener
-{
-public:
-	virtual ~LineListenerFixture()
-	{
-	}
-
-	void onLine(const std::string &file, unsigned int lineNr,
-			unsigned long addr)
-	{
-		m_lineToAddr[lineNr] = addr;
-	}
-
-protected:
-	std::unordered_map<unsigned int, unsigned long> m_lineToAddr;
-};
-
-class AddressListenerFixture : public IReporter::IListener, public ICollector::IListener
-{
-public:
-	virtual ~AddressListenerFixture()
-	{
-	}
-
-	void onAddress(uint64_t addr, unsigned long hits)
-	{
-		m_addrToHits[addr] = hits;
-	}
-
-	void onAddressHit(uint64_t addr, unsigned long hits)
-	{
-		m_breakpointToHits[addr] = hits;
-	}
-
-protected:
-	std::unordered_map<unsigned int, unsigned long> m_addrToHits;
-	std::unordered_map<unsigned int, unsigned long> m_breakpointToHits;
-};
-
-
-TESTSUITE(merge_parser)
-{
-	TEST(marshal)
-	{
-		MockParser mockParser;
-		MockReporter reporter;
-		auto &filter = IFilter::create();
-
-		REQUIRE_CALL(mockParser, registerFileListener(_))
-			.TIMES(2)
-		;
-		REQUIRE_CALL(mockParser, registerLineListener(_))
-			.TIMES(2)
-		;
-
-		mock_data = {'a', '\n', 'b', '\n', '\0'};
-		mocked_ts = 1;
-
-		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
-
-		mock_file_exists(mocked_file_exists);
-		mock_read_file(mocked_read_file);
-		mock_get_file_timestamp(mocked_get_timestamp);
-
-		parser.onLine("a", 1, 2);
-		parser.onLine("a", 1, 3); // Two addresses on the same line
-		parser.onLine("a", 2, 3);
-
-		parser.onLine("c", 2, 5);
-
-		const struct file_data *p;
-
-		// Does not exist
-		p = parser.marshalFile("b");
-		ASSERT_TRUE(!p);
-
-		// But this one does
-		p = parser.marshalFile("a");
-		ASSERT_TRUE(p);
-
-		ASSERT_TRUE(be_to_host<uint32_t>(p->magic) == MERGE_MAGIC);
-		ASSERT_TRUE(be_to_host<uint32_t>(p->version) == MERGE_VERSION);
-		ASSERT_TRUE(be_to_host<uint32_t>(p->n_entries) == 2);
-
-		char *name = ((char *)p) + be_to_host<uint32_t>(p->file_name_offset);
-		ASSERT_TRUE(std::string(name) == "a");
-		ASSERT_TRUE(name + strlen(name) + 1 - (char *)p == be_to_host<uint32_t>(p->size));
-
-		ASSERT_TRUE(be_to_host<uint32_t>(p->entries[0].line) == 1);
-		ASSERT_TRUE(be_to_host<uint32_t>(p->entries[0].n_addresses) == 2);
-
-		uint64_t *addressTable = (uint64_t *)((char *)p + be_to_host<uint32_t>(p->address_table_offset));
-		uint32_t start = be_to_host<uint32_t>(p->entries[0].address_start);
-
-		ASSERT_TRUE(be_to_host<uint64_t>(addressTable[start]) == parser.hashAddress("a", 1, 2));
-		ASSERT_TRUE(be_to_host<uint64_t>(addressTable[start + 1]) == parser.hashAddress("a", 1, 3) + 1);
-
-		// No output
-		MergeParser parser2(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
-
-		parser2.onLine("c", 4, 1);
-		// New timestamp for the "a" file
-		mocked_ts = 2;
-		parser2.onLine("a", 1, 2);
-
-		const struct file_data *p2;
-
-		// Test that the checksum changes on new TS
-		p2 = parser2.marshalFile("a");
-		ASSERT_TRUE(p2);
-
-		ASSERT_TRUE(p->checksum == p2->checksum);
-		ASSERT_TRUE(p->timestamp != p2->timestamp);
-
-		// ... but is the same with the old TS
-		p = parser.marshalFile("c");
-		p2 = parser2.marshalFile("c");
-		ASSERT_TRUE(p);
-		ASSERT_TRUE(p2);
-
-		// Should be the same
-		ASSERT_TRUE(p->checksum == p2->checksum);
-		ASSERT_TRUE(p->timestamp == p2->timestamp);
-
-		// Same timestamp, different data
-		parser.onLine("d", 9, 1);
-		mock_data = {'a', '\n', 'b', 'c', '\n', '\0'};
-		parser2.onLine("d", 9, 1);
-
-		p = parser.marshalFile("d");
-		p2 = parser2.marshalFile("d");
-		ASSERT_TRUE(p);
-		ASSERT_TRUE(p2);
-
-		ASSERT_TRUE(p->timestamp == p2->timestamp);
-		ASSERT_TRUE(p->checksum != p2->checksum);
-	}
-
-	TEST(output)
-	{
-		auto &filter = IFilter::create();
-		MockParser mockParser;
-		MockReporter reporter;
-
-		REQUIRE_CALL(mockParser, registerFileListener(_))
-			.TIMES(1)
-		;
-		REQUIRE_CALL(mockParser, registerLineListener(_))
-			.TIMES(1)
-		;
-
-		mock_data = {'a', '\n', 'b', '\n', '\0'};
-		mocked_ts = 1;
-
-		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
-
-		mock_file_exists(mocked_file_exists);
-		mock_read_file(mocked_read_file);
-		mock_write_file(mocked_write_file);
-		mock_get_file_timestamp(mocked_get_timestamp);
-
-		parser.onLine("a", 1, 2);
-		parser.onLine("b", 2, 3);
-
-		parser.onStop();
-
-		std::string p0 = parser.m_outputDirectory + "/metadata/" + fmt("%08x", hash_block("a", 1));
-		std::string p1 = parser.m_outputDirectory + "/metadata/" + fmt("%08x", hash_block("b", 1));
-
-		ASSERT_TRUE(path_to_data.find(p0) != path_to_data.end());
-		ASSERT_TRUE(path_to_data.find(p1) != path_to_data.end());
-	}
-
-	TEST(input, LineListenerFixture, AddressListenerFixture)
-	{
-		auto &filter = IFilter::create();
-		MockParser mockParser;
-		MockReporter reporter;
-
-		REQUIRE_CALL(mockParser, registerFileListener(_))
-			.TIMES(2)
-		;
-		REQUIRE_CALL(mockParser, registerLineListener(_))
-			.TIMES(2)
-		;
-
-		mock_data = {'a', '\n', 'b', '\n', '\0'};
-		mocked_ts = 1;
-
-		MergeParser parser(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
-
-		mock_file_exists(mocked_file_exists);
-		mock_read_file(mocked_read_file);
-		mock_write_file(mocked_write_file);
-		mock_get_file_timestamp(mocked_get_timestamp);
-
-		// Register the collector address listener
-		parser.registerListener(*this);
-
-		parser.onLine("a", 1, 2);
-		parser.onLine("a", 3, 9);
-		parser.onLine("a", 4, 72);
-		parser.onLine("b", 2, 3);
-
-		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("b", 2, 3)] == 0);
-		parser.onAddress(3, 2);
-		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("b", 2, 3)] == 2);
-
-		// Register afterwards to get everything on parse below...
-		parser.registerLineListener(*this);
-
-		// Non-hash file
-		parser.parseOne("/tmp/kalle/df/", "some-other-file");
-
-		// Non-existing
-		parser.parseOne("/tmp/kalle/df/", "12345678");
-
-		// Existing (but fake, anyway)
-		parser.parseOne("/tmp/kalle/df/",
-				fmt("0x%08x", parser.m_files["a"]->m_checksum));
-
-		const struct file_data *p;
-		p = parser.marshalFile("a");
-		ASSERT_TRUE(p);
-
-		MergeParser parser2(mockParser, reporter, "/tmp", "/tmp/kalle", filter);
-		parser2.registerLineListener(*this);
-		parser2.registerListener(*this);
-
-		// Valid file and data
-		ASSERT_TRUE(m_lineToAddr.size() == 0);
-		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("a", 4, 72)] == 0);
-
-		// See to it that we "know of" file "a"
-		parser2.onLine("a", 4, 72);
-
-		// Mark all entries as executed in the table (should yield hits below)
-		uint64_t *table = (uint64_t*)((const char *)p + be_to_host<uint32_t>(p->address_table_offset));
-
-		for (unsigned int i = 0; i < 4; i++)
-			table[i] = to_be<uint64_t>((be_to_host<uint64_t>(table[i]) | (1ULL << 63)));
-
-		mock_data.clear();
-
-		uint8_t *b = (uint8_t *)p;
-		for (unsigned int i = 0; i < be_to_host<uint32_t>(p->size); i++)
-			mock_data.push_back(b[i]);
-
-
-		parser2.parseOne("/tmp/kalle/df/",
-				fmt("0x%08x", parser.m_files["a"]->m_checksum));
-		ASSERT_TRUE(m_lineToAddr.size() == 3);
-		ASSERT_TRUE(m_lineToAddr[1] == parser.hashAddress("a", 1, 2));
-		ASSERT_TRUE(m_breakpointToHits[parser.hashAddress("a", 4, 72)] == 1);
-
-		free((void *)p);
-	}
-}
diff --git a/kcov-38/tests/unit-tests/tests-reporter.cc b/kcov-38/tests/unit-tests/tests-reporter.cc
deleted file mode 100644
index bdae2b04084a..000000000000
--- a/kcov-38/tests/unit-tests/tests-reporter.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-#include "test.hh"
-
-#include <file-parser.hh>
-#include <collector.hh>
-#include <reporter.hh>
-#include <filter.hh>
-#include <utils.hh>
-
-#include <string>
-#include <unordered_map>
-
-#include "../../src/reporter.cc"
-#include "mocks/mock-collector.hh"
-
-using namespace kcov;
-
-class ElfListener : public IFileParser::ILineListener
-{
-public:
-	virtual ~ElfListener()
-	{
-	}
-
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-		// Just store the lastest to have something
-		m_lineToAddr[lineNr] = addr;
-		if (m_file == "")
-			m_file = file;
-	}
-
-	std::string m_file;
-	std::unordered_map<unsigned int, unsigned long> m_lineToAddr;
-};
-
-DISABLED_TEST(reporter)
-{
-	ElfListener elfListener;
-	IFileParser *elf;
-	bool res;
-	char filename[1024];
-
-	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(elf);
-
-	elf->registerLineListener(elfListener);
-
-	MockCollector collector;
-
-	REQUIRE_CALL(collector, registerListener(_))
-		.TIMES(1)
-		.LR_SIDE_EFFECT(collector.mockRegisterListener(_1))
-		;
-
-
-	Reporter &reporter = (Reporter &)IReporter::create(*elf, collector, IFilter::create());
-
-	IReporter::ExecutionSummary summary =
-			reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_lines == 0U);
-	ASSERT_TRUE(summary.m_executedLines == 0U);
-
-	res = elf->addFile(filename);
-	ASSERT_TRUE(res);
-
-	res = elf->parse();
-	ASSERT_TRUE(res);
-
-	summary = reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_lines == 17U); // Executable lines
-	ASSERT_TRUE(summary.m_executedLines == 0U);
-
-
-	// Test something which doesn't exist
-	collector.m_listener->onAddressHit(100, 1);
-
-	summary = reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_executedLines == 0U);
-
-	// See test-source.c
-	IReporter::LineExecutionCount lc =
-			reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
-	ASSERT_TRUE(lc.m_hits == 0U);
-	ASSERT_TRUE(lc.m_possibleHits == 1U);
-
-
-	ASSERT_TRUE(elfListener.m_lineToAddr[8]);
-
-	// and something which does
-	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[19], 1);
-
-	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
-	ASSERT_TRUE(lc.m_hits == 1U);
-	ASSERT_TRUE(lc.m_possibleHits == 1U);
-
-	// Once again (should not happen except on marshalling - this should
-	// not count up the number of hits)
-	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[19], 1);
-	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 19);
-	ASSERT_TRUE(lc.m_hits == 1U);
-
-	summary = reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_executedLines == 1U);
-
-	res = reporter.lineIsCode(elfListener.m_file.c_str(), 19);
-	ASSERT_TRUE(res == true);
-
-	res = reporter.lineIsCode(elfListener.m_file.c_str(), 13);
-	ASSERT_TRUE(res == false);
-
-	// Test marshal and unmarshal
-	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[16], 1);
-
-	summary = reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_executedLines == 2U);
-
-	size_t sz;
-	void *data = reporter.marshal(&sz);
-	ASSERT_TRUE(sz >= 0U);
-	ASSERT_TRUE(data);
-
-	// Happened after, not part of the marshalling
-	collector.m_listener->onAddressHit(elfListener.m_lineToAddr[17], 1);
-
-	summary = reporter.getExecutionSummary();
-	ASSERT_TRUE(summary.m_executedLines == 3U);
-
-	res = reporter.unMarshal(data, sz);
-	ASSERT_TRUE(res);
-	lc = reporter.getLineExecutionCount(elfListener.m_file.c_str(), 16);
-	ASSERT_TRUE(lc.m_hits == 1U);
-	ASSERT_TRUE(lc.m_possibleHits == 1U);
-
-	struct marshalHeaderStruct *hdr = (struct marshalHeaderStruct *)data;
-	hdr->checksum++;
-	res = reporter.unMarshal(data, sz);
-	ASSERT_FALSE(res);
-	hdr->checksum--;
-
-	hdr->db_version++;
-	res = reporter.unMarshal(data, sz);
-	ASSERT_FALSE(res);
-	hdr->db_version--;
-
-	hdr->magic++;
-	res = reporter.unMarshal(data, sz);
-	ASSERT_FALSE(res);
-
-	free(data);
-}
diff --git a/kcov-38/tests/unit-tests/tests-system-mode.cc b/kcov-38/tests/unit-tests/tests-system-mode.cc
deleted file mode 100644
index baf172421870..000000000000
--- a/kcov-38/tests/unit-tests/tests-system-mode.cc
+++ /dev/null
@@ -1,449 +0,0 @@
-#include "test.hh"
-
-#include <configuration.hh>
-#include <utils.hh>
-
-#include "../../src/engines/system-mode-file-format.hh"
-
-#include <system-mode/file-data.hh>
-#include <system-mode/registration.hh>
-
-using namespace kcov_system_mode;
-using namespace kcov;
-
-TESTSUITE(system_mode_formats)
-{
-	TEST(can_marshal_empty_struct)
-	{
-		class system_mode_memory mem("kalle-anka", "--include-pattern=anka --exclude-pattern=hejbo", 0);
-
-		size_t size;
-		auto file = memoryToFile(mem, size);
-		char *p = (char *)file;
-		ASSERT_TRUE(file);
-
-		ASSERT_TRUE(file->magic == SYSTEM_MODE_FILE_MAGIC);
-		ASSERT_TRUE(file->version == SYSTEM_MODE_FILE_VERSION);
-		ASSERT_TRUE(file->n_entries == 0);
-		ASSERT_TRUE(file->filename_offset == sizeof(*file));
-		ASSERT_TRUE(file->kcov_options_offset == file->filename_offset + mem.filename.size() + 1);
-
-		auto fn = std::string(&p[file->filename_offset]);
-		auto opts = std::string(&p[file->kcov_options_offset]);
-
-		ASSERT_TRUE(fn == "kalle-anka");
-		ASSERT_TRUE(opts == "--include-pattern=anka --exclude-pattern=hejbo");
-	}
-
-	TEST(can_marshal_single_entry_struct)
-	{
-		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
-
-		mem.data[0] = 0x12345678;
-
-		size_t size;
-		auto file = memoryToFile(mem, size);
-		char *p = (char *)file;
-		ASSERT_TRUE(file);
-
-		ASSERT_TRUE(file->n_entries == 1);
-		ASSERT_TRUE(file->data[0] == 0x12345678);
-
-		auto fn = std::string(&p[file->filename_offset]);
-		auto opts = std::string(&p[file->kcov_options_offset]);
-
-		ASSERT_TRUE(fn == "roy-gunnar-ramstedt");
-		ASSERT_TRUE(opts == "moa");
-	}
-
-	TEST(can_marshal_multi_entry_struct)
-	{
-		class system_mode_memory mem("", "simon", 3);
-
-		mem.data[0] = 0x12345678;
-		mem.data[1] = 0x56789abc;
-		mem.data[2] = 0xaabbccdd;
-
-		size_t size;
-		auto file = memoryToFile(mem, size);
-		char *p = (char *)file;
-		ASSERT_TRUE(file);
-
-		ASSERT_TRUE(file->n_entries == 3);
-		ASSERT_TRUE(file->data[0] == 0x12345678);
-		ASSERT_TRUE(file->data[1] == 0x56789abc);
-		ASSERT_TRUE(file->data[2] == 0xaabbccdd);
-
-		auto fn = std::string(&p[file->filename_offset]);
-		auto opts = std::string(&p[file->kcov_options_offset]);
-
-		ASSERT_TRUE(fn == "");
-		ASSERT_TRUE(opts == "simon");
-	}
-
-	TEST(cannot_unmarshal_with_invalid_magic)
-	{
-		struct system_mode_file f{};
-
-		f.magic = SYSTEM_MODE_FILE_MAGIC+1;
-		f.version = SYSTEM_MODE_FILE_VERSION;
-
-		auto mem = fileToMemory(f);
-		ASSERT_FALSE(mem);
-	}
-
-	TEST(cannot_unmarshal_with_invalid_version)
-	{
-		struct system_mode_file f{};
-
-		f.magic = SYSTEM_MODE_FILE_MAGIC;
-		f.version = SYSTEM_MODE_FILE_VERSION + 1;
-
-		auto mem = fileToMemory(f);
-		ASSERT_FALSE(mem);
-	}
-
-	TEST(cannot_unmarshal_with_invalid_string_offsets)
-	{
-		struct system_mode_file f{};
-
-		f.magic = SYSTEM_MODE_FILE_MAGIC;
-		f.version = SYSTEM_MODE_FILE_VERSION;
-
-		f.filename_offset = 0; // Should be atleast sizeof(f)
-
-		auto mem = fileToMemory(f);
-		ASSERT_FALSE(mem);
-
-		f.filename_offset = sizeof(f);
-		f.kcov_options_offset = sizeof(f); // Should be at least + 1
-		mem = fileToMemory(f);
-
-		ASSERT_FALSE(mem);
-	}
-
-	TEST(can_unmarshal_empty_struct)
-	{
-		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) + 2);
-
-		f->magic = SYSTEM_MODE_FILE_MAGIC;
-		f->version = SYSTEM_MODE_FILE_VERSION;
-		f->filename_offset = sizeof(*f);
-		f->kcov_options_offset = f->filename_offset + 1;
-
-		auto mem = fileToMemory(*f);
-		ASSERT_TRUE(mem);
-
-		ASSERT_TRUE(mem->n_entries == 0);
-		ASSERT_TRUE(mem->filename == "");
-		ASSERT_TRUE(mem->options == "");
-	}
-
-	TEST(can_unmarshal_single_entry_struct)
-	{
-		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) +
-				sizeof(uint32_t) +
-				strlen("hej") + strlen("hopp") + 2);
-		char *p = (char *)f;
-
-		f->magic = SYSTEM_MODE_FILE_MAGIC;
-		f->version = SYSTEM_MODE_FILE_VERSION;
-		f->n_entries = 1;
-		f->filename_offset = sizeof(*f) + sizeof(uint32_t);
-		f->kcov_options_offset = f->filename_offset + strlen("hej") + 1;
-		strcpy(&p[f->filename_offset], "hej");
-		strcpy(&p[f->kcov_options_offset], "hopp");
-		f->data[0] = 0x12345678;
-
-
-		auto mem = fileToMemory(*f);
-		ASSERT_TRUE(mem);
-
-		ASSERT_TRUE(mem->filename == "hej");
-		ASSERT_TRUE(mem->options == "hopp");
-		ASSERT_TRUE(mem->n_entries == 1);
-		ASSERT_TRUE(mem->data[0] == 0x12345678);
-	}
-
-	TEST(can_unmarshal_multi_entry_struct)
-	{
-		struct system_mode_file *f = (struct system_mode_file *)xmalloc(sizeof(struct system_mode_file) +
-				sizeof(uint32_t) * 3 +
-				strlen("a") + strlen("b") + 2);
-		char *p = (char *)f;
-
-		f->magic = SYSTEM_MODE_FILE_MAGIC;
-		f->version = SYSTEM_MODE_FILE_VERSION;
-		f->n_entries = 3;
-		f->filename_offset = sizeof(*f) + sizeof(uint32_t) * 3;
-		f->kcov_options_offset = f->filename_offset + strlen("hej") + 1;
-		strcpy(&p[f->filename_offset], "a");
-		strcpy(&p[f->kcov_options_offset], "b");
-		f->data[0] = 0x12345678;
-		f->data[1] = 123;
-		f->data[2] = 4711;
-
-
-		auto mem = fileToMemory(*f);
-		ASSERT_TRUE(mem);
-
-		ASSERT_TRUE(mem->filename == "a");
-		ASSERT_TRUE(mem->options == "b");
-		ASSERT_TRUE(mem->n_entries == 3);
-		ASSERT_TRUE(mem->data[0] == 0x12345678);
-		ASSERT_TRUE(mem->data[1] == 123);
-		ASSERT_TRUE(mem->data[2] == 4711);
-	}
-
-	TEST(out_of_bounds_indexes_are_not_hit)
-	{
-		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
-		class system_mode_memory memEmpty("roy-gunnar-ramstedt", "moa", 0);
-
-		// 0..31 are possible
-		ASSERT_FALSE(mem.indexIsHit(32));
-		ASSERT_FALSE(memEmpty.indexIsHit(0));
-	}
-
-	TEST(can_report_single_hit)
-	{
-		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 1);
-
-		mem.reportIndex(1);
-
-		ASSERT_FALSE(mem.indexIsHit(0));
-		ASSERT_TRUE(mem.indexIsHit(1));
-	}
-
-	TEST(can_report_multiple_hits)
-	{
-		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 4);
-
-		for (unsigned i = 0; i < 4 * 32; i += 2)
-		{
-			mem.reportIndex(i);
-		}
-
-		for (unsigned i = 0; i < 4 * 32; i++)
-		{
-			if (i % 2 == 0)
-			{
-				ASSERT_TRUE(mem.indexIsHit(i));
-			}
-			else
-			{
-				ASSERT_FALSE(mem.indexIsHit(i));
-			}
-		}
-	}
-
-	TEST(can_detect_dirtyness)
-	{
-		class system_mode_memory mem("roy-gunnar-ramstedt", "moa", 4);
-
-		ASSERT_FALSE(mem.isDirty());
-
-		mem.reportIndex(4 * 32 - 1);
-		ASSERT_TRUE(mem.isDirty());
-
-		mem.markClean();
-		ASSERT_FALSE(mem.isDirty());
-
-		mem.reportIndex(4 * 32 - 2);
-		ASSERT_TRUE(mem.isDirty());
-	}
-}
-
-TESTSUITE(system_mode_file_data)
-{
-	TEST(file_with_no_entries_will_not_have_a_trailer)
-	{
-		uint8_t data[1];
-
-		auto f = SystemModeFile::fromRawFile(1, "", "", (void *)data, sizeof(data));
-		ASSERT_TRUE(f);
-
-		size_t sz;
-		auto processed = f->getProcessedData(sz);
-		ASSERT_TRUE(processed);
-		ASSERT_TRUE(sz == sizeof(data));
-
-		ASSERT_TRUE(f->getOptions() == "");
-		ASSERT_TRUE(f->getFilename() == "");
-
-		ASSERT_TRUE(f->getId() == 1U);
-	}
-
-	TEST(can_add_entries)
-	{
-		uint8_t data[1];
-
-		data[0] = 0xf2;
-
-		auto f = SystemModeFile::fromRawFile(2, "manne.elf", "kalle-anka", (void *)data, sizeof(data));
-		ASSERT_TRUE(f);
-
-		ASSERT_TRUE(f->getFilename() == "manne.elf");
-		ASSERT_TRUE(f->getOptions() == "kalle-anka");
-		ASSERT_TRUE(f->getId() == 2U);
-
-		f->addEntry(0, 0x12345678);
-		f->addEntry(1000, 0x98765432);
-
-		auto entries = f->getEntries();
-		ASSERT_TRUE(entries.size() == 1001);
-		ASSERT_TRUE(entries[0] == 0x12345678);
-		ASSERT_TRUE(entries[1] == 0); // Not set
-		ASSERT_TRUE(entries[1000] == 0x98765432);
-
-		size_t sz;
-		auto processed = f->getProcessedData(sz);
-		ASSERT_TRUE(processed);
-		ASSERT_TRUE(sz > sizeof(data));
-
-		// Verify the actual data
-		ASSERT_TRUE(memcmp(data, processed, sizeof(data)) == 0);
-
-		auto f2 = SystemModeFile::fromProcessedFile(processed, sz);
-		ASSERT_TRUE(f2);
-
-		entries = f2->getEntries();
-
-		// Should be the same as in f
-		ASSERT_TRUE(entries.size() == 1001);
-		ASSERT_TRUE(entries[0] == 0x12345678);
-		ASSERT_TRUE(entries[1] == 0); // Still not set
-		ASSERT_TRUE(entries[1000] == 0x98765432);
-
-		ASSERT_TRUE(f2->getFilename() == "manne.elf");
-		ASSERT_TRUE(f2->getOptions() == "kalle-anka");
-		ASSERT_TRUE(f2->getId() == 2U);
-	}
-
-	TEST(cannot_create_system_mode_file_if_trailer_isnt_8_byte_aligned)
-	{
-		for (unsigned i = 0; i < 7; i++)
-		{
-			uint8_t data[i];
-
-			auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-			ASSERT_FALSE(f);
-		}
-	}
-
-	TEST(cannot_create_system_mode_file_if_options_or_filename_size_isnt_8_byte_aligned)
-	{
-		uint8_t data[sizeof(uint64_t) + sizeof(struct trailer)];
-		struct trailer *trailer = (struct trailer *)&data[sizeof(uint64_t)];
-
-		memset(data, 0, sizeof(data));
-
-		trailer->compressed_size = 0;
-		trailer->uncompressed_size = 0;
-		trailer->options_size = 7;
-		trailer->filename_size = 8;
-		trailer->magic = TRAILER_MAGIC;
-		trailer->version = TRAILER_VERSION;
-		trailer->n_entries = 0;
-
-		auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_FALSE(f);
-
-		trailer->options_size = 15;
-		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_FALSE(f);
-
-		trailer->options_size = 24;
-		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_TRUE(f);
-
-		trailer->filename_size = 7;
-		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_FALSE(f);
-	}
-
-	TEST(cannot_create_system_mode_file_if_trailer_magic_or_version_is_wrong)
-	{
-		uint8_t data[sizeof(uint64_t) * 2 + sizeof(struct trailer)];
-		struct trailer *trailer = (struct trailer *)&data[sizeof(uint64_t) * 2];
-
-		memset(data, 0, sizeof(data));
-		char *filename = (char *)data;
-		filename[0] = 'x';
-		filename[1] = '\0';
-
-		char *options = (char *)data + 8;
-		options[0] = 'a';
-		options[1] = 'b';
-		options[2] = 'c';
-		options[3] = '\0';
-
-		trailer->compressed_size = 0;
-		trailer->uncompressed_size = 0;
-		trailer->filename_size = 8;
-		trailer->options_size = 8;
-		trailer->magic = TRAILER_MAGIC;
-		trailer->version = TRAILER_VERSION;
-		trailer->n_entries = 0;
-
-		auto f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_TRUE(f);
-		ASSERT_TRUE(f->getOptions() == "abc");
-
-		trailer->magic++;
-		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_FALSE(f);
-
-		trailer->magic--;
-		trailer->version++;
-		f = SystemModeFile::fromProcessedFile(data, sizeof(data));
-		ASSERT_FALSE(f);
-	}
-}
-
-TESTSUITE(system_mode_registration)
-{
-	TEST(can_parse_entries_it_created)
-	{
-		auto entry = createProcessEntry(5, "simon");
-		ASSERT_TRUE(entry);
-
-		uint16_t op;
-		std::string of;
-		auto rv = parseProcessEntry(entry, op, of);
-		ASSERT_TRUE(rv);
-		ASSERT_TRUE(op == 5);
-		ASSERT_TRUE(of == "simon");
-	}
-
-	TEST(cannot_parse_entries_with_wrong_magic_or_version)
-	{
-		auto entry = createProcessEntry(3, "linda");
-		uint16_t op;
-		std::string of;
-
-		entry->magic++;
-		auto rv = parseProcessEntry(entry, op, of);
-		ASSERT_FALSE(rv);
-
-		entry->magic--;
-		entry->version++;
-		rv = parseProcessEntry(entry, op, of);
-		ASSERT_FALSE(rv);
-
-		entry->version--;
-		rv = parseProcessEntry(entry, op, of);
-		ASSERT_TRUE(rv);
-	}
-
-	TEST(cannot_parse_entries_with_size_smaller_than_filename)
-	{
-		auto entry = createProcessEntry(3, "linda");
-		uint16_t op;
-		std::string of;
-
-		entry->entry_size = sizeof(struct new_process_entry) - 1;
-		auto rv = parseProcessEntry(entry, op, of);
-		ASSERT_FALSE(rv);
-	}
-}
diff --git a/kcov-38/tests/unit-tests/tests-utils.cc b/kcov-38/tests/unit-tests/tests-utils.cc
deleted file mode 100644
index c3fbb3b1d65c..000000000000
--- a/kcov-38/tests/unit-tests/tests-utils.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "test.hh"
-
-#include <utils.hh>
-#include <string>
-
-TESTSUITE(utils)
-{
-	TEST(escapeHtml)
-	{
-		char buf[8192];
-
-		memset(buf, '&', sizeof(buf));
-		buf[sizeof(buf) - 1] = '\0';
-
-		std::string s = escape_html(buf);
-		// Should have been truncated
-		ASSERT_TRUE(s.size() < 4096);
-
-		ASSERT_TRUE(s.find("&amp;") != std::string::npos);
-	}
-
-	TEST(escapeJson)
-	{
-		std::string a = "var kalle=1;";
-		std::string b = "var kalle=\"1\";";
-		std::string c = "var a=\"\\hej\";";
-		std::string d = "var kalle=\tX;";
-		std::string e = "var kalle='X';";
-
-		std::string s;
-
-		s = escape_json(a);
-		ASSERT_TRUE(s == a);
-
-		s = escape_json(b);
-		ASSERT_TRUE(s == "var kalle=\\\"1\\\";");
-
-		s = escape_json(c);
-		ASSERT_TRUE(s == "var a=\\\"\\\\hej\\\";");
-
-		s = escape_json(d);
-		ASSERT_TRUE(s == "var kalle=\\tX;");
-
-		s = escape_json(e);
-		ASSERT_TRUE(s == "var kalle=\\'X\\';");
-	}
-
-	TEST(can_concatenate_directory_and_file_correctly)
-	{
-		std::string empty = "";
-		std::string root = "/";
-		std::string singleNoSlash = "/kalle";
-		std::string singleSlash = "/kalle/";
-		std::string singleDoubleSlashes = "/kalle//";
-		std::string doubleNoSlashes = "/kalle/manne";
-		std::string doubleDoubleSlashes = "/kalle/manne//";
-
-		ASSERT_TRUE(dir_concat(empty, "hej") == "hej");
-		ASSERT_TRUE(dir_concat(root, "hej") == "/hej");
-		ASSERT_TRUE(dir_concat(singleNoSlash, "hej") == "/kalle/hej");
-		ASSERT_TRUE(dir_concat(singleSlash, "hej") == "/kalle/hej");
-		ASSERT_TRUE(dir_concat(singleDoubleSlashes, "hej") == "/kalle/hej");
-		ASSERT_TRUE(dir_concat(doubleNoSlashes, "hej") == "/kalle/manne/hej");
-		ASSERT_TRUE(dir_concat(doubleDoubleSlashes, "hej") == "/kalle/manne/hej");
-
-		// Filename with slash
-		ASSERT_TRUE(dir_concat(singleDoubleSlashes, "/hej") == "/kalle/hej");
-	}
-}
diff --git a/kcov-38/tests/unit-tests/tests-writer.cc b/kcov-38/tests/unit-tests/tests-writer.cc
deleted file mode 100644
index 6dada543f086..000000000000
--- a/kcov-38/tests/unit-tests/tests-writer.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-#include "test.hh"
-
-#include <file-parser.hh>
-#include <collector.hh>
-#include <configuration.hh>
-#include <reporter.hh>
-#include <output-handler.hh>
-#include <writer.hh>
-#include <utils.hh>
-
-#include <chrono>
-#include <thread>
-#include <sys/types.h>
-#include <dirent.h>
-
-#include "../../src/writers/html-writer.hh"
-#include "../../src/writers/cobertura-writer.hh"
-
-#include "mocks/mock-collector.hh"
-#include "mocks/mock-reporter.hh"
-
-using namespace kcov;
-
-
-static int filePatternInDir(const char *name, const char *pattern)
-{
-	DIR *d = opendir(name);
-	ASSERT_TRUE(d);
-
-	struct dirent *de = readdir(d);
-	int out = 0;
-
-	while (de)
-	{
-		if (strstr(de->d_name, pattern))
-			out++;
-		de = readdir(d);
-	}
-
-	return out;
-}
-
-DISABLED_TEST(writer, DEADLINE_REALTIME_MS(20000))
-{
-	IFileParser *elf;
-	bool res;
-	char filename[1024];
-	MockReporter reporter;
-	IReporter::LineExecutionCount def(0, 1, 0);
-	IReporter::LineExecutionCount partial(1, 2, 0);
-	IReporter::LineExecutionCount full(3, 3, 0);
-	IReporter::ExecutionSummary summary(17, 4);
-
-	std::string outDir = (std::string(crpcut::get_start_dir()) + "/kcov-writer");
-	system(fmt("rm -rf %s", outDir.c_str()).c_str());
-
-	sprintf(filename, "%s/test-binary", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(elf);
-
-	const char *argv[] = {NULL, outDir.c_str(), filename};
-	IConfiguration &conf = IConfiguration::getInstance();
-	res = conf.parse(3, argv);
-	ASSERT_TRUE(res);
-
-	REQUIRE_CALL(reporter, lineIsCode(_,_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((true))
-		;
-	REQUIRE_CALL(reporter, fileIsIncluded(_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((true))
-		;
-	REQUIRE_CALL(reporter, lineIsCode(_,7))
-		.TIMES(AT_LEAST(4)) // Both files
-		.RETURN((false))
-		;
-
-	REQUIRE_CALL(reporter, getLineExecutionCount(_,_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((def))
-		;
-	REQUIRE_CALL(reporter, getLineExecutionCount(_,8))
-		.TIMES(AT_LEAST(3))
-		.RETURN((partial))
-		;
-	REQUIRE_CALL(reporter, getLineExecutionCount(_,11))
-		.TIMES(AT_LEAST(2))
-		.RETURN((full))
-		;
-	REQUIRE_CALL(reporter, getExecutionSummary())
-		.TIMES(AT_LEAST(3))
-		.RETURN((summary))
-		;
-
-	MockCollector collector;
-
-	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
-	IWriter &writer = createHtmlWriter(*elf, reporter,
-			output.getBaseDirectory(), output.getOutDirectory(), "kalle");
-	IWriter &coberturaWriter = createCoberturaWriter(*elf, reporter,
-			output.getOutDirectory() + "/cobertura.xml");
-
-	output.registerWriter(writer);
-	output.registerWriter(coberturaWriter);
-
-	res = elf->addFile(filename);
-	ASSERT_TRUE(res == true);
-	res = elf->parse();
-	ASSERT_TRUE(res == true);
-	output.start();
-
-	output.produce();
-
-	REQUIRE_CALL(reporter, marshal(_))
-		.TIMES(AT_LEAST(1))
-		.LR_RETURN(reporter.mockMarshal(_1))
-		;
-
-	output.produce();
-
-	ASSERT_TRUE(filePatternInDir((outDir + "/test-binary").c_str(), "test-source.c") >= 1);
-	ASSERT_TRUE(file_exists((outDir + "/test-binary/cobertura.xml").c_str()));
-
-	output.start();
-
-	delete &output; // UGLY!
-}
-
-
-DISABLED_TEST(writerSameName, DEADLINE_REALTIME_MS(20000))
-{
-	IFileParser *elf;
-	bool res;
-	char filename[1024];
-	MockReporter reporter;
-	IReporter::LineExecutionCount def(0, 1, 0);
-	IReporter::LineExecutionCount partial(1, 2, 1);
-	IReporter::LineExecutionCount full(3, 3, 2);
-	IReporter::ExecutionSummary summary(17, 4);
-
-	std::string outDir = (std::string(crpcut::get_start_dir()) + "/kcov-writerSameName");
-	system(fmt("rm -rf %s", outDir.c_str()).c_str());
-
-	sprintf(filename, "%s/same-name-test", crpcut::get_start_dir());
-	elf = IParserManager::getInstance().matchParser(filename);
-	ASSERT_TRUE(elf);
-
-	const char *argv[] = {NULL, outDir.c_str(), filename};
-	IConfiguration &conf = IConfiguration::getInstance();
-	res = conf.parse(3, argv);
-	ASSERT_TRUE(res);
-
-	REQUIRE_CALL(reporter, lineIsCode(_,_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((true))
-		;
-	REQUIRE_CALL(reporter, fileIsIncluded(_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((true))
-		;
-
-	REQUIRE_CALL(reporter, getLineExecutionCount(_,_))
-		.TIMES(AT_LEAST(1))
-		.RETURN((def))
-		;
-	REQUIRE_CALL(reporter, getExecutionSummary())
-		.TIMES(AT_LEAST(2))
-		.RETURN((summary))
-		;
-
-	MockCollector collector;
-	IOutputHandler &output = IOutputHandler::create(reporter, &collector);
-	IWriter &writer = createHtmlWriter(*elf, reporter,
-			output.getBaseDirectory(), output.getOutDirectory(), "anka");
-
-	output.registerWriter(writer);
-
-	res = elf->addFile(filename);
-	ASSERT_TRUE(res == true);
-	res = elf->parse();
-	ASSERT_TRUE(res == true);
-	output.start();
-
-	output.produce();
-
-	REQUIRE_CALL(reporter, marshal(_))
-		.TIMES(AT_LEAST(1))
-		.LR_RETURN(reporter.mockMarshal(_1))
-		;
-
-	output.produce();
-
-	int cnt = filePatternInDir((outDir + "/same-name-test").c_str(), "html");
-	ASSERT_TRUE(cnt == 4); // index.html + 3 source files
-
-	delete &output; // UGLY!
-}
diff --git a/kcov-38/tools/CMakeLists.txt b/kcov-38/tools/CMakeLists.txt
deleted file mode 100644
index 2ce9ae8a9173..000000000000
--- a/kcov-38/tools/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-cmake_minimum_required (VERSION 2.8.4)
-project (kcov-tools)
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
-
-if (POLICY CMP0042)
-    # MACOSX_RPATH is enabled by default.
-    cmake_policy (SET CMP0042 NEW)
-endif (POLICY CMP0042)
-
-option (SPECIFY_RPATH  "Specify RPATH for installed executables" OFF)
-mark_as_advanced (SPECIFY_RPATH)
-
-find_package (LibElf REQUIRED)
-find_package (Elfutils REQUIRED)
-find_package (PkgConfig REQUIRED)
-find_package (Threads)
-find_package (ZLIB REQUIRED)
-
-find_library (DL_LIBRARY NAMES dl)
-if (DL_LIBRARY)
-    message (STATUS "Found DL: ${DL_LIBRARY}")
-else (DL_LIBRARY)
-    message (FATAL_ERROR "Could NOT find DL")
-endif (DL_LIBRARY)
-
-find_library (M_LIBRARY NAMES m)
-if (M_LIBRARY)
-    message (STATUS "Found M: ${M_LIBRARY}")
-else (M_LIBRARY)
-    message (FATAL_ERROR "Could NOT find M")
-endif (M_LIBRARY)
-
-# ====================================
-# project name and version
-# ====================================
-set (LINE2ADDR line2addr)
-
-set (${LINE2ADDR}_SRCS
-    ../src/capabilities.cc
-    ../src/configuration.cc
-    ../src/filter.cc
-    ../src/gcov.cc
-    ../src/parsers/dwarf.cc
-    ../src/parsers/elf-parser.cc
-    ../src/parsers/elf.cc
-    ../src/parsers/dummy-disassembler.cc
-    ../src/parser-manager.cc
-    ../src/utils.cc
-    line2addr.cc
-)
-
-
-set (CMAKE_CXX_FLAGS "-std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX}")
-
-include_directories(
-    ../src/include/
-    ${LIBELF_INCLUDE_DIRS}
-    ${LIBDW_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
-# Reference: http://www.cmake.org/Wiki/CMake_RPATH_handling
-if (SPECIFY_RPATH)
-    set (CMAKE_SKIP_BUILD_RPATH OFF)
-    set (CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
-    set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
-    # the RPATH to be used when installing, but only if it's not a system directory
-    list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" IS_SYSTEM_DIR)
-    if (IS_SYSTEM_DIR EQUAL -1)
-        set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-    endif (IS_SYSTEM_DIR EQUAL -1)
-endif (SPECIFY_RPATH)
-
-add_executable (${LINE2ADDR} ${${LINE2ADDR}_SRCS})
-
-target_link_libraries(${LINE2ADDR}
-    "${DL_LIBRARY}"
-    ${LIBDW_LIBRARIES}
-    ${LIBELF_LIBRARIES}
-    "${M_LIBRARY}"
-    stdc++
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${ZLIB_LIBRARIES})
diff --git a/kcov-38/tools/line2addr.cc b/kcov-38/tools/line2addr.cc
deleted file mode 100644
index bb2f677dbd2a..000000000000
--- a/kcov-38/tools/line2addr.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <configuration.hh>
-#include <file-parser.hh>
-#include <utils.hh>
-
-using namespace kcov;
-
-const char *kcov_version = "";
-
-class Listener : public IFileParser::ILineListener
-{
-public:
-	Listener(IFileParser &parser, const std::string &filePattern, int lineNr) :
-		m_filePattern(filePattern),
-		m_lineNr(lineNr)
-	{
-		parser.registerLineListener(*this);
-	}
-
-	virtual ~Listener()
-	{
-	}
-
-	void onLine(const std::string &file, unsigned int lineNr, uint64_t addr)
-	{
-		if (file.find(m_filePattern) != std::string::npos) {
-			if (m_lineNr < 0 || lineNr == (unsigned int)m_lineNr)
-				report(addr);
-		}
-	}
-
-private:
-	void report(unsigned long addr)
-	{
-		printf("0x%lx\n", addr);
-	}
-
-	const std::string m_filePattern;
-	int m_lineNr;
-};
-
-int main(int argc, const char *argv[])
-{
-	if (argc < 3) {
-		fprintf(stderr, "Usage: line2addr in-file file-pattern [line-nr]\n");
-		return 1;
-	}
-
-	std::string file(argv[1]);
-	std::string fileName(argv[2]);
-	int lineNr = -1;
-
-	if (argc >= 4) {
-		if (!string_is_integer(argv[3])) {
-			fprintf(stderr, "line-nr argument (%s) must be integer\n", argv[3]);
-			exit(1);
-		}
-
-		lineNr = string_to_integer(argv[3]);
-	}
-
-
-	IFileParser *parser = IParserManager::getInstance().matchParser(file);
-	if (!parser) {
-		fprintf(stderr, "Can't match parser for %s\n", file.c_str());
-		return 1;
-	}
-
-	Listener listener(*parser, fileName, lineNr);
-
-	parser->addFile(file);
-
-	return parser->parse() ? 0 : 1;
-}
diff --git a/kcov-38/travis/Makefile b/kcov-38/travis/Makefile
deleted file mode 100644
index c8143bb0b08c..000000000000
--- a/kcov-38/travis/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/make
-
-chroot=/tmp/32-bit-chroot
-kcov_deps=libdw-dev libelf-dev elfutils libcurl4-openssl-dev python python3 cmake binutils-dev git
-
-.PHONY: prepare_environment
-
-build_reference:
-	mkdir -p reference/src reference/build
-	cd reference/ && git clone https://github.com/SimonKagstrom/kcov.git
-	cd reference/kcov && git checkout v23
-	cd reference/build && cmake ../kcov
-	make -C reference/build/
-	cp reference/build/src/kcov /tmp/kcov-reference
-
-build-osx-xcode:
-	mkdir -p build-xcode
-	cd build-xcode && cmake -G Xcode ..
-	cd build-xcode && xcodebuild
-
-build-osx: build-osx-xcode
-	mkdir -p build build-tests
-	cd build && cmake ..
-	make -C build
-	cd build-tests && cmake ../tests
-	make -C build-tests
-
-build:
-	mkdir -p build build-tests build-tools
-	cd build && CXXFLAGS=-Werror cmake ..
-	make -C build
-	cd build-tools && cmake ../tools
-	make -C build-tools
-	sudo make -C build install
-	cd build-tests && cmake ../tests
-	make -C build-tests
-
-build_gcc: build run_unit_tests build_reference patchelf-i386-chroot
-	sudo rm -rf ${chroot}/tmp/kcov/build ${chroot}/tmp/kcov/build-tests
-	sudo mkdir -p ${chroot}/tmp/kcov/build ${chroot}/tmp/kcov/build-tests ${chroot}/tmp/kcov/build-tools
-	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build && cmake .."
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build"
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build install"
-	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build-tools && cmake ../tools"
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-tools"
-	sudo i386 chroot ${chroot} sh -c "cd /tmp/kcov/build-tests && cmake ../tests"
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-tests"
-	sudo i386 chroot ${chroot} sh -c "apt-get -y remove binutils-dev"
-	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/kcov/build-no-binutils && cd /tmp/kcov/build-no-binutils && cmake .."
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-no-binutils"
-	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/kcov/build-static && cd /tmp/kcov/build-static && cmake -DKCOV_STATIC_BUILD=ON .."
-	sudo i386 chroot ${chroot} sh -c "make -C /tmp/kcov/build-static"
-
-build_clang_linux:
-	mkdir -p build build-tests build-tools
-	cd build && CC=clang-3.9 CXX=clang++-3.9 CXXFLAGS=-Werror cmake ..
-	make -C build
-	cd build-tools && cmake ../tools
-	make -C build-tools
-	sudo make -C build install
-	cd build-tests && CC=clang-3.9 CXX=clang++-3.9 cmake ../tests
-	CC=clang-3.9 CXX=clang++-3.9 make -C build-tests
-
-build_clang:
-	mkdir -p build build-tests build-tools
-	cd build && CC=clang-3.9 CXX=clang++-3.9 CXXFLAGS=-Werror cmake ..
-	make -C build
-	cd build-tools && cmake ../tools
-	make -C build-tools
-	sudo make -C build install
-	cd build-tests && CC=clang-3.9 CXX=clang++-3.9 cmake ../tests
-	CC=clang-3.9 CXX=clang++-3.9 make -C build-tests
-
-run-performance: build_gcc
-	travis/perf-test.sh build/src/kcov . build >/dev/null
-	/usr/bin/time -f "%e" travis/perf-test.sh build/src/kcov . build >/dev/null
-	rm -rf /tmp/kcov-perf
-	travis/perf-test.sh /tmp/kcov-reference . build >/dev/null
-	/usr/bin/time -f "%e" travis/perf-test.sh /tmp/kcov-reference . build >/dev/null
-
-run-tests-linux-gcc: run-performance
-	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
-	sudo i386 chroot ${chroot} sh -c "mkdir -p /tmp/output"
-	sudo i386 chroot ${chroot} sh -c "PATH=/bin:/usr/bin:/sbin:/usr/sbin /tmp/kcov/tests/tools/run-tests /tmp/kcov/build/src/kcov /tmp/output /tmp/kcov/build-tests/ /tmp/kcov -v"
-	build/src/kcov --coveralls-id=$(TRAVIS_JOB_ID) --include-pattern=kcov --exclude-pattern=helper.cc,library.cc,html-data-files.cc /tmp/kcov-kcov build/src/kcov || true
-	wget https://codecov.io/bash || true
-	bash bash -s /tmp/kcov-kcov || true
-
-run-tests-linux-clang: build_clang_linux
-	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
-
-trompeloeil:
-	git submodule update --recursive --remote
-
-patchelf:
-	wget https://github.com/NixOS/patchelf/archive/0.9.tar.gz
-	tar -xf 0.9.tar.gz
-	cd patchelf-0.9 && ./bootstrap.sh && ./configure && make && sudo make install
-
-patchelf-i386-chroot: patchelf
-	wget https://github.com/NixOS/patchelf/archive/0.9.tar.gz
-	sudo cp 0.9.tar.gz ${chroot}
-	sudo i386 chroot ${chroot} sh -c "tar -xf 0.9.tar.gz"
-	sudo i386 chroot ${chroot} sh -c "cd patchelf-0.9 && ./bootstrap.sh && ./configure && make && make install"
-
-build_unit_tests: trompeloeil
-	mkdir -p build-ut
-	cd build-ut && CXX=g++-6 CC=gcc-6 cmake ../tests/unit-tests/
-	CXX=g++-6 CC=gcc-6 make -C build-ut
-
-run_unit_tests: build build_unit_tests
-	cd build-ut && ./ut
-
-run-tests-osx-gcc: build-osx
-	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
-
-run-tests-osx-clang: build-osx
-	tests/tools/run-tests build/src/kcov /tmp/ build-tests/ `pwd` -v
-
-
-run-tests: run-tests-${TRAVIS_OS_NAME}-${CC}
-
-
-prepare_osx_clang:
-
-prepare_osx_gcc:
-
-prepare_osx:
-	brew update
-	brew install zlib
-	brew upgrade python
-	brew install bash
-
-prepare_linux: patchelf
-	sudo sh -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
-	sudo add-apt-repository ppa:jonlar/crpcut -y
-	sudo apt-get update -q
-	sudo apt-get install -y --allow-unauthenticated ${kcov_deps} gcc-multilib debootstrap git time curl crpcut crpcut-dev
-
-prepare_linux_gcc:
-	sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-	sudo apt-get update -q
-	sudo apt-get install g++-6
-
-	sudo i386 debootstrap --arch=i386 --components=main,universe  precise $(chroot)
-	sudo i386 chroot "${chroot}" apt-get update
-	sudo i386 chroot "${chroot}" apt-get install -y build-essential autoconf
-	sudo i386 chroot "${chroot}" apt-get install -y --allow-unauthenticated ${kcov_deps}
-	sudo cp -r "$(shell pwd)" "${chroot}/tmp/"
-	sudo i386 chroot "${chroot}" sh -c "mount -t proc procfs /proc"
-	sudo i386 chroot "${chroot}" sh -c "mount -t tmpfs none /dev/shm"
-
-
-prepare_linux_clang:
-	sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'
-	sudo apt-get update --force-yes -qq
-	sudo apt-get install -qq --force-yes -y clang-3.9 libboost-all-dev binutils-dev
-
-prepare_environment: prepare_${TRAVIS_OS_NAME} prepare_${TRAVIS_OS_NAME}_${CC}
diff --git a/kcov-38/travis/perf-test.sh b/kcov-38/travis/perf-test.sh
deleted file mode 100755
index 05f0a16d9f07..000000000000
--- a/kcov-38/travis/perf-test.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 3 ] ; then
-	echo "Usage: perf-test.sh <kcov> <src-dir> <build-dir>"
-	exit 1
-fi
-
-KCOV=$1
-SRC=$2
-BUILD=$3
-
-$KCOV /tmp/kcov-perf $BUILD/src/kcov
-$KCOV /tmp/kcov-perf $SRC/tests/python/main 5
-$KCOV /tmp/kcov-perf $SRC/tests/bash/shell-main 5
-$KCOV /tmp/kcov-perf $BUILD/src/kcov /tmp/kcov-perf $SRC/tests/python/main 5
-$KCOV /tmp/kcov-perf $BUILD/src/kcov /tmp/kcov-perf $SRC/tests/bash/shell-main 5
-
-exit 0

From 8b51e513d8b1f35d76883d2af2e2a4fb57df0ff8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:10:25 -0500
Subject: [PATCH 042/118] wip

---
 .github/workflows/ci-rust.yml | 41 ++++++++++++++++++++++++++++-------
 .github/workflows/grcov.yml   |  3 ++-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 4c5327de50b8..8a9bb89b451c 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -14,15 +14,40 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Push to codecov.io
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Update apt repositories
+        run: sudo apt update
+
+      - name: Install apt packages
         run: |
-          cargo install cargo-tarpaulin
-          cargo tarpaulin make test-vectors --out Xml
-          bash <(curl -s https://codecov.io/bash) -X gcov -t $CODECOV_TOKEN
+            sudo apt install ocl-icd-opencl-dev
+            sudo apt-get install -y libhwloc-dev
+
+      # TODO enable when protoc needed again
+      # - name: Install Protoc
+      #   uses: arduino/setup-protoc@master
+      #   with:
+      #     version: "3.9.1"
+
+      - name: Toolchain setup
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      
+      - name: Pull submodules
+        run: git submodule update --init
+    
+      - name: Setup code coverage output
+      - run: |
+            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+      - name: Run Code Coverage
+      - run: |
+            cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+      - name: Upload result to codecov.io
+      - run: |
+            bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   test:
     name: test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 020715d78c31..f448ed858de2 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -27,7 +27,8 @@ jobs:
       - name: Install apt packages
         run: |
             sudo apt install ocl-icd-opencl-dev make clang pkg-config libssl-dev libclang-dev
-            sudo apt-get install -y libhwloc-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc
+            sudo apt-get install -y libhwloc-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc \
+            make clang pkg-config libssl-dev libclang-dev
 
       - name: Install toolchain
         uses: actions-rs/toolchain@v1

From 5900e6a697863bb105f03fbed8e85700e4d35263 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:14:00 -0500
Subject: [PATCH 043/118] wip

---
 .github/workflows/ci-rust.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 8a9bb89b451c..ccfc1324c512 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -35,10 +35,8 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      
       - name: Pull submodules
         run: git submodule update --init
-    
       - name: Setup code coverage output
       - run: |
             echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV

From f0212f22ba606c45ee6c82ef3ee4b4b12b319c42 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:16:35 -0500
Subject: [PATCH 044/118] wip

---
 .github/workflows/ci-rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index ccfc1324c512..d871078f54d5 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -38,13 +38,13 @@ jobs:
       - name: Pull submodules
         run: git submodule update --init
       - name: Setup code coverage output
-      - run: |
+        run: |
             echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
       - name: Run Code Coverage
-      - run: |
+        run: |
             cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
       - name: Upload result to codecov.io
-      - run: |
+        run: |
             bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   test:
     name: test

From 05df9556d59750cd9070d000eda8dcb9a0503f41 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:26:01 -0500
Subject: [PATCH 045/118] wip

---
 .github/workflows/ci-rust.yml | 44 +++++++++++------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index d871078f54d5..2b9c4e114839 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -9,43 +9,25 @@ on:
       - master
 
 jobs:
-  cov:
-    name: Code Coverage
+  test:
+    name: coverage
     runs-on: ubuntu-latest
+    container:
+      image: xd009642/tarpaulin
+      options: --security-opt seccomp=unconfined
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Update apt repositories
-        run: sudo apt update
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-      - name: Install apt packages
+      - name: Generate code coverage
         run: |
-            sudo apt install ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev
-
-      # TODO enable when protoc needed again
-      # - name: Install Protoc
-      #   uses: arduino/setup-protoc@master
-      #   with:
-      #     version: "3.9.1"
+          cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml
 
-      - name: Toolchain setup
-        uses: actions-rs/toolchain@v1
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v1
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Pull submodules
-        run: git submodule update --init
-      - name: Setup code coverage output
-        run: |
-            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
-      - name: Run Code Coverage
-        run: |
-            cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
-      - name: Upload result to codecov.io
-        run: |
-            bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
+          # token:                ${{secrets.CODECOV_TOKEN}} # not required for public repos
+          fail_ci_if_error:     true
   test:
     name: test
     runs-on: ubuntu-latest

From f58a459590aa114792e2517f4d935ab201716208 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:26:43 -0500
Subject: [PATCH 046/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 2b9c4e114839..d4d456d1688b 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 jobs:
-  test:
+  cov:
     name: coverage
     runs-on: ubuntu-latest
     container:

From 3cd8827c50a98621f04f2a0a787b08c188cf5501 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:31:32 -0500
Subject: [PATCH 047/118] wip

---
 .github/workflows/ci-rust.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index d4d456d1688b..2e481a56d7a7 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -18,7 +18,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            override: true
+            components: rustfmt, clippy
       - name: Generate code coverage
         run: |
           cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml

From ee3849015d0cf6008ec0680dbe5a16ebfecb07e2 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:41:23 -0500
Subject: [PATCH 048/118] wip

---
 .github/workflows/ci-rust.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 2e481a56d7a7..efd66c96374b 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -18,6 +18,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Update apt repositories
+        run: sudo apt update
+      - name: Install apt packages
+        run: |
+            sudo apt install ocl-icd-opencl-dev
+            sudo apt-get install -y libhwloc-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From e40c64f9c9a8904eb75f20c09cab43db2d5aba7c Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:49:56 -0500
Subject: [PATCH 049/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index efd66c96374b..14d7b9a4dd2d 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Update apt repositories
-        run: sudo apt update
+        run: apt update && apt install sudo
       - name: Install apt packages
         run: |
             sudo apt install ocl-icd-opencl-dev

From a6119335e9837a9c53a87c889eeb6426e9899282 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:51:20 -0500
Subject: [PATCH 050/118] wip

---
 .github/workflows/ci-rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 14d7b9a4dd2d..280475913bbe 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -19,11 +19,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Update apt repositories
-        run: apt update && apt install sudo
+        run: apt update
       - name: Install apt packages
         run: |
-            sudo apt install ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev
+            apt install ocl-icd-opencl-dev
+            apt-get install -y libhwloc-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From 293000a4931633b9d88792fa0de53a287ab2a1af Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:54:54 -0500
Subject: [PATCH 051/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 280475913bbe..40e8c9883829 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -22,7 +22,7 @@ jobs:
         run: apt update
       - name: Install apt packages
         run: |
-            apt install ocl-icd-opencl-dev
+            apt install -y ocl-icd-opencl-dev
             apt-get install -y libhwloc-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1

From dbf901d5c580fc9272475ee3d10b00edbf12f256 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 20:56:48 -0500
Subject: [PATCH 052/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 40e8c9883829..37e07ecb5877 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Update apt repositories
-        run: apt update
+        run: apt update -y
       - name: Install apt packages
         run: |
             apt install -y ocl-icd-opencl-dev

From 68b5a3110e75c9c5529a493dd42371f3f6a624b2 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 21:35:00 -0500
Subject: [PATCH 053/118] wip

---
 .github/workflows/ci-rust.yml |  35 +++++++++++-
 .github/workflows/grcov.yml   | 104 ++++++++++------------------------
 2 files changed, 64 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 37e07ecb5877..592885f67980 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -37,8 +37,39 @@ jobs:
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v1
         with:
-          # token:                ${{secrets.CODECOV_TOKEN}} # not required for public repos
-          fail_ci_if_error:     true
+          fail_ci_if_error: true
+  coverme:
+    name: COV-2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Update apt repositories
+        run: apt update -y
+      - name: Install apt packages
+        run: |
+            apt install -y ocl-icd-opencl-dev
+            apt-get install -y libhwloc-dev
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          components: rustfmt, clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --verbose --all-features --no-fail-fast
+        env:
+          CARGO_INCREMENTAL: '0'
+          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+      - uses: actions-rs/grcov@v0.1
+      - name: Coveralls upload
+        uses: coverallsapp/github-action@master
+        with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            path-to-lcov: ${{ steps.coverage.outputs.report }}
   test:
     name: test
     runs-on: ubuntu-latest
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index f448ed858de2..993fa2aef210 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -10,76 +10,34 @@ on:
 name: Code coverage with grcov
 
 jobs:
-  grcov:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        #   - macOS-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Update apt repositories
-        run: sudo apt update
-
-      - name: Install apt packages
-        run: |
-            sudo apt install ocl-icd-opencl-dev make clang pkg-config libssl-dev libclang-dev
-            sudo apt-get install -y libhwloc-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc \
-            make clang pkg-config libssl-dev libclang-dev
-
-      - name: Install toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-          profile: minimal
-
-      - name: Pull submodules
-        run: git submodule update --init
-
-      - name: Run all unit tests
-        run: make test
-
-    #   - name: Run test vectors
-    #     run: make run-vectors
-
-        env:
-          CARGO_INCREMENTAL: 0
-          RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
-
-      # Note that `actions-rs/grcov` Action can install `grcov` too,
-      # but can't use faster installation methods yet.
-      # As a temporary experiment `actions-rs/install` Action plugged in here.
-      # Consider **NOT** to copy that into your workflow,
-      # but use `actions-rs/grcov` only
-      - name: Pre-installing grcov
-        uses: actions-rs/install@v0.1
-        with:
-          crate: grcov
-          use-tool-cache: true
-
-      - name: Gather coverage data
-        id: coverage
-        uses: actions-rs/grcov@v0.1
-        with:
-          coveralls-token: ${{ secrets.COVERALLS_TOKEN }}
-
-      - name: Coveralls upload
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GIT_TOKEN }}
-          parallel: true
-          path-to-lcov: ${{ steps.coverage.outputs.report }}
-
-  grcov_finalize:
-    runs-on: ubuntu-latest
-    needs: grcov
-    steps:
-      - name: Coveralls finalization
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GIT_TOKEN }}
-          parallel-finished: true
\ No newline at end of file
+    lint:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout repo
+            uses: actions/checkout@v2
+          - name: Update apt repositories
+            run: apt update -y
+        - name: Install apt packages
+            run: |
+                apt install -y ocl-icd-opencl-dev
+                apt-get install -y libhwloc-dev
+        - name: Install latest nightly
+          uses: actions-rs/toolchain@v1
+          with:
+            toolchain: nightly
+            override: true
+            components: rustfmt, clippy
+          - uses: actions-rs/cargo@v1
+            with:
+              command: test
+              args: --all-features --no-fail-fast
+            env:
+              CARGO_INCREMENTAL: '0'
+              RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+              RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          - uses: actions-rs/grcov@v0.1
+          - name: Coveralls upload
+            uses: coverallsapp/github-action@master
+            with:
+                github-token: ${{ secrets.GITHUB_TOKEN }}
+                path-to-lcov: ${{ steps.coverage.outputs.report }}
\ No newline at end of file

From 5df7c5599db5adcec87c919688ef4d0eb580dc45 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 21:38:35 -0500
Subject: [PATCH 054/118] wip

---
 .github/workflows/ci-rust.yml | 3 ++-
 .github/workflows/grcov.yml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 592885f67980..b0f388f46fd9 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -56,6 +56,7 @@ jobs:
           toolchain: nightly
           override: true
           components: rustfmt, clippy
+      - name: Execute tests
         uses: actions-rs/cargo@v1
         with:
           command: test
@@ -68,7 +69,7 @@ jobs:
       - name: Coveralls upload
         uses: coverallsapp/github-action@master
         with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
+            github-token: ${{ secrets.GIT_TOKEN }}
             path-to-lcov: ${{ steps.coverage.outputs.report }}
   test:
     name: test
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 993fa2aef210..c2a0c963e861 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -13,7 +13,7 @@ jobs:
     lint:
         runs-on: ubuntu-latest
         steps:
-          - name: Checkout repo
+        - name: Checkout repo
             uses: actions/checkout@v2
           - name: Update apt repositories
             run: apt update -y

From 861fd64369c115e2e1c04a8ea8362ecc3aef4a84 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 21:39:46 -0500
Subject: [PATCH 055/118] wip

---
 .github/workflows/ci-rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index b0f388f46fd9..d4ad6eb6f8bc 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -45,11 +45,11 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Update apt repositories
-        run: apt update -y
+        run: sudo apt update
       - name: Install apt packages
         run: |
-            apt install -y ocl-icd-opencl-dev
-            apt-get install -y libhwloc-dev
+            sudo apt install -y ocl-icd-opencl-dev
+            sudo apt-get install -y libhwloc-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From b465cde73e9ee2082c81e4524bff7d70bb597661 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 22:03:14 -0500
Subject: [PATCH 056/118] wip

---
 .github/workflows/ci-rust.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index d4ad6eb6f8bc..b78403ac5a33 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -56,6 +56,11 @@ jobs:
           toolchain: nightly
           override: true
           components: rustfmt, clippy
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "10.0"
+          directory: ${{ runner.temp }}/llvm      
       - name: Execute tests
         uses: actions-rs/cargo@v1
         with:

From 6a8f88ce95d47256e42e581955a91f67beb7a50f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 22:09:57 -0500
Subject: [PATCH 057/118] wip

---
 .github/workflows/ci-rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index b78403ac5a33..38bf7435cff9 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -48,8 +48,8 @@ jobs:
         run: sudo apt update
       - name: Install apt packages
         run: |
-            sudo apt install -y ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev
+            sudo apt install -y ocl-icd-opencl-dev 
+            sudo apt-get install -y libhwloc-dev libclang-dev gcc
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From 3d2bde02d445f87699014630e3b9f8c95678dba8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 22:26:36 -0500
Subject: [PATCH 058/118] wip

---
 .github/workflows/ci-rust.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 38bf7435cff9..7272401b9d1f 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -32,7 +32,7 @@ jobs:
             components: rustfmt, clippy
       - name: Generate code coverage
         run: |
-          cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml
+          cargo +nightly tarpaulin --verbose --all-features --workspace --exclude tests/* --timeout 120 --out Xml
 
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v1
@@ -55,12 +55,7 @@ jobs:
         with:
           toolchain: nightly
           override: true
-          components: rustfmt, clippy
-      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@v1
-        with:
-          version: "10.0"
-          directory: ${{ runner.temp }}/llvm      
+          components: rustfmt, clippy     
       - name: Execute tests
         uses: actions-rs/cargo@v1
         with:

From 8efc9b7bb2bf76859541db1608efb43330e56ae8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 31 Oct 2020 22:39:31 -0500
Subject: [PATCH 059/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 7272401b9d1f..be49f3ef78d7 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Install apt packages
         run: |
             sudo apt install -y ocl-icd-opencl-dev 
-            sudo apt-get install -y libhwloc-dev libclang-dev gcc
+            sudo apt-get install -y libhwloc-dev clang llvm libclang-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From dfadf8b8edc3837884a5e963f109c0444fb6067e Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 10:06:21 -0600
Subject: [PATCH 060/118] wip

---
 .github/workflows/ci-rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index be49f3ef78d7..bd3317de6428 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -63,8 +63,8 @@ jobs:
           args: --verbose --all-features --no-fail-fast
         env:
           CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
       - uses: actions-rs/grcov@v0.1
       - name: Coveralls upload
         uses: coverallsapp/github-action@master

From ed2679cf0a7c3b7b81174e9ec2687fdb9ccc6ae6 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 10:08:24 -0600
Subject: [PATCH 061/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index bd3317de6428..d6d9f74872a0 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -64,7 +64,7 @@ jobs:
         env:
           CARGO_INCREMENTAL: '0'
           RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          RUSTDOCFLAGS: '-Cpanic=abort'
       - uses: actions-rs/grcov@v0.1
       - name: Coveralls upload
         uses: coverallsapp/github-action@master

From 52ea6d6c8a7797e232dde73260aceac8ebfd2757 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 10:28:48 -0600
Subject: [PATCH 062/118] wip

---
 .github/workflows/ci-rust.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index d6d9f74872a0..376898731d24 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -55,16 +55,18 @@ jobs:
         with:
           toolchain: nightly
           override: true
-          components: rustfmt, clippy     
-      - name: Execute tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --verbose --all-features --no-fail-fast
+          components: rustfmt, clippy
+
+      - name: Pull submodules
+        run: git submodule update --init
+
+      - name: Run all unit tests
+        run: make test
         env:
           CARGO_INCREMENTAL: '0'
           RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
           RUSTDOCFLAGS: '-Cpanic=abort'
+          
       - uses: actions-rs/grcov@v0.1
       - name: Coveralls upload
         uses: coverallsapp/github-action@master

From 32ac7d1db3bd902f16f7045ff795297a36c1f21b Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 10:46:10 -0600
Subject: [PATCH 063/118] wip

---
 .github/workflows/ci-rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 376898731d24..672bee76ef99 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -48,8 +48,8 @@ jobs:
         run: sudo apt update
       - name: Install apt packages
         run: |
-            sudo apt install -y ocl-icd-opencl-dev 
-            sudo apt-get install -y libhwloc-dev clang llvm libclang-dev
+            sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
+            sudo apt-get install -y libhwloc-dev llvm
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
@@ -66,7 +66,7 @@ jobs:
           CARGO_INCREMENTAL: '0'
           RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
           RUSTDOCFLAGS: '-Cpanic=abort'
-          
+
       - uses: actions-rs/grcov@v0.1
       - name: Coveralls upload
         uses: coverallsapp/github-action@master

From e66b99937f0de913bf1139906b1658d0e301606a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:02:43 -0600
Subject: [PATCH 064/118] wip

---
 .github/workflows/ci-rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 672bee76ef99..8f0891144241 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -32,7 +32,7 @@ jobs:
             components: rustfmt, clippy
       - name: Generate code coverage
         run: |
-          cargo +nightly tarpaulin --verbose --all-features --workspace --exclude tests/* --timeout 120 --out Xml
+          cargo +nightly tarpaulin --verbose -l --all-features --workspace --exclude-files tests/conformance_tests/src --timeout 120 --out Xml
 
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v1

From 170d0521a55093797bac7541c952a94f9e3e0cf5 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:26:54 -0600
Subject: [PATCH 065/118] wip

---
 .github/workflows/ci-rust.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 8f0891144241..4559ef138f74 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -48,8 +48,13 @@ jobs:
         run: sudo apt update
       - name: Install apt packages
         run: |
-            sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
-            sudo apt-get install -y libhwloc-dev llvm
+            sudo apt install -y ocl-icd-opencl-dev make g++-5 clang-7 libgoogle-perftools-dev pkg-config libssl-dev
+            sudo apt-get install -y libhwloc-dev llvm-toolchain-trusty-7 
+        env:
+          - GCC_CXX=g++-5
+          - GCOV=gcov-5
+          - CLANG_CXX=clang++-7
+          - DEPLOY=0
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From 16143f71b620f1c9e47bdc623c181181958ffe0e Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:32:20 -0600
Subject: [PATCH 066/118] wip

---
 .github/workflows/ci-rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 4559ef138f74..51e020874007 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -51,10 +51,10 @@ jobs:
             sudo apt install -y ocl-icd-opencl-dev make g++-5 clang-7 libgoogle-perftools-dev pkg-config libssl-dev
             sudo apt-get install -y libhwloc-dev llvm-toolchain-trusty-7 
         env:
-          - GCC_CXX=g++-5
-          - GCOV=gcov-5
-          - CLANG_CXX=clang++-7
-          - DEPLOY=0
+          GCC_CXX=g++-5
+          GCOV=gcov-5
+          CLANG_CXX=clang++-7
+          DEPLOY=0
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From cceaaaf830f25447d8aaf0464d08a00b730199b1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:35:50 -0600
Subject: [PATCH 067/118] wip

---
 .github/workflows/ci-rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 51e020874007..4f83094ca445 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -51,10 +51,10 @@ jobs:
             sudo apt install -y ocl-icd-opencl-dev make g++-5 clang-7 libgoogle-perftools-dev pkg-config libssl-dev
             sudo apt-get install -y libhwloc-dev llvm-toolchain-trusty-7 
         env:
-          GCC_CXX=g++-5
-          GCOV=gcov-5
-          CLANG_CXX=clang++-7
-          DEPLOY=0
+          GCC_CXX: 'g++-5'
+          GCOV: 'gcov-5'
+          CLANG_CXX: 'clang++-7'
+          DEPLOY: '0'
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

From 2126b9ef2a0c4b4cb91170c89dd490c05dd6f8d3 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:42:00 -0600
Subject: [PATCH 068/118] wip

---
 .github/workflows/ci-rust.yml             |  2 +-
 automation/emit_coverage_info.sh          | 57 -----------------------
 blockchain/chain/src/store/chain_store.rs |  2 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 automation/emit_coverage_info.sh

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 4f83094ca445..133e981321c3 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Install apt packages
         run: |
             sudo apt install -y ocl-icd-opencl-dev make g++-5 clang-7 libgoogle-perftools-dev pkg-config libssl-dev
-            sudo apt-get install -y libhwloc-dev llvm-toolchain-trusty-7 
+            sudo apt-get install -y libhwloc-dev llvm 
         env:
           GCC_CXX: 'g++-5'
           GCOV: 'gcov-5'
diff --git a/automation/emit_coverage_info.sh b/automation/emit_coverage_info.sh
deleted file mode 100644
index 61811a466a94..000000000000
--- a/automation/emit_coverage_info.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-# Run tests in order to produce coverage data. Does not collect coverage data,
-# just produces it. Note that we ignore all test failures -- some of the
-# experimental flags we use cause test failures, we don't really care, other CI
-# tasks check this anyway.
-#
-# Note that running this outside of CI doesn't work on all platforms. In
-# particular, macos needs further patches in order to work, probably windows
-# too. It's really intended for use inside CI only.
-#
-# Finally, this must be done on nightly -- `cargo-tarpaulin`, which works on
-# stable, also has issues with NSS, but not ones that seem easy to work around.
-# As a result, we use `grcov`. Ultimately `grcov` should long-term allow us to
-# integrate coverage data from over the FFI, which is a huge plus to this
-# approach, so it's probably for the best, even if `grcov`'s actual coverage
-# information seems to be of lower quality than `tarpaulin`.
-
-if [[ ! -f "$PWD/automation/emit_coverage_info.sh" ]]
-then
-    echo "emit_coverage_info.sh must be executed from the root directory."
-    exit 1
-fi
-
-cargo +nightly clean
-# Note that incremental builds, as well as sccache seems to break coverage :(.
-# So, we disable those.
-export CARGO_INCREMENTAL=0
-unset RUSTC_WRAPPER
-# TODO: re-add `-Clink-dead-code` to RUSTFLAGS -- right now it causes a build
-# linker error in NSS, as apparently some part of NSS we don't use doesn't have
-# the build flags set up correctly. This makes our code coverage accuracy worse,
-# but AFAICT, not in a massive way -- or at least codecov.io seems to account
-# for it in some manner.
-#
-# Also, this `--cfg coverage` is how the `#[cfg(coverage)]` we use in some parts
-# of the rust code comes into existence (it's non-standard)
-export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort --cfg coverage";
-export RUSTDOCFLAGS="-Cpanic=abort"
-
-# Apparently --no-default-features doesn't work in the root, even with -p to select a specific package.
-# Instead we pull the list of individual package manifest files which have default features
-# out of `cargo metadata` and test using --manifest-path for each individual package.
-for manifest in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select((.features | .default | length) > 0) | .manifest_path'); do
-    package=$(dirname "$manifest")
-    package=$(basename "$package")
-    echo "## no-default-features test for package $package (manifest @ $manifest)"
-    cargo +nightly test --manifest-path "$manifest" --no-default-features --no-fail-fast || true
-done
-
-cargo +nightly test --all --no-fail-fast || true
-
-cargo +nightly run -p sync-test || true
-cargo +nightly run -p protobuf-gen -- tools/protobuf_files.toml || true
-cargo +nightly run -p systest || true
-
-env RUSTFLAGS="--cfg __appsvc_ci_hack $RUSTFLAGS" cargo +nightly test --all --all-features --no-fail-fast || true
\ No newline at end of file
diff --git a/blockchain/chain/src/store/chain_store.rs b/blockchain/chain/src/store/chain_store.rs
index 982b9360f60c..172ead9ae506 100644
--- a/blockchain/chain/src/store/chain_store.rs
+++ b/blockchain/chain/src/store/chain_store.rs
@@ -834,7 +834,7 @@ pub async fn sub_head_changes(
 #[cfg(feature = "json")]
 pub mod headchange_json {
     use super::*;
-    use blocks::tipset_json::TipsetJsonRef;
+    use blocks::{tipset::tipset_json::TipsetJsonRef, Tipset};
     use serde::Serialize;
 
     #[derive(Serialize)]

From 9675df93ef59fb9acc3e5d9c43d1abdaaa083be1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:58:52 -0600
Subject: [PATCH 069/118] wip

---
 .github/workflows/ci.yml |   46 +
 coveralls.json           | 1751 --------------------------------------
 2 files changed, 46 insertions(+), 1751 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 coveralls.json

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000000..e39dc9b0d126
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,46 @@
+name: CI
+on: [pull_request]
+env:
+  CLICOLOR_FORCE: 1
+jobs:
+  ci:
+    name: CI
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [stable, beta, nightly, 1.47.0]
+        os: [ubuntu-latest, macOS-latest]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        profile: minimal
+        override: true
+    - name: Install cargo-make
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: --debug cargo-make
+    - name: Run CI
+      if: matrix.rust == 'stable' || matrix.rust == 'beta'
+      uses: actions-rs/cargo@v1
+      with:
+        command: run
+        args: --bin cargo-make --target-dir target/ci -- make ci-flow  --all-features
+    - name: Run CI (Allow Failures)
+      if: matrix.rust == 'nightly'
+      continue-on-error: true
+      uses: actions-rs/cargo@v1
+      with:
+        command: run
+        args: --bin cargo-make --target-dir target/ci -- make ci-flow  --all-features
+    - name: Run CI (Minimal Supported Rust Version)
+      if: matrix.rust != 'stable' && matrix.rust != 'beta' && matrix.rust != 'nightly'
+      uses: actions-rs/cargo@v1
+      with:
+        command: make
+        args: ci-flow --all-features
\ No newline at end of file
diff --git a/coveralls.json b/coveralls.json
deleted file mode 100644
index 153b5251cacc..000000000000
--- a/coveralls.json
+++ /dev/null
@@ -1,1751 +0,0 @@
-#!/usr/bin/env bash
-
-# Apache License Version 2.0, January 2004
-# https://github.com/codecov/codecov-bash/blob/master/LICENSE
-
-
-set -e +o pipefail
-
-VERSION="20201009-048fee3"
-
-codecov_flags=( )
-url="https://codecov.io"
-env="$CODECOV_ENV"
-service=""
-token=""
-search_in=""
-# shellcheck disable=SC2153
-flags="$CODECOV_FLAGS"
-exit_with=0
-curlargs=""
-curlawsargs=""
-dump="0"
-clean="0"
-curl_s="-s"
-name="$CODECOV_NAME"
-include_cov=""
-exclude_cov=""
-ddp="$HOME/Library/Developer/Xcode/DerivedData"
-xp=""
-files=""
-save_to=""
-cacert="$CODECOV_CA_BUNDLE"
-gcov_ignore="-not -path './bower_components/**' -not -path './node_modules/**' -not -path './vendor/**'"
-gcov_include=""
-
-ft_gcov="1"
-ft_coveragepy="1"
-ft_fix="1"
-ft_search="1"
-ft_s3="1"
-ft_network="1"
-ft_xcodellvm="1"
-ft_xcodeplist="0"
-ft_gcovout="1"
-ft_html="0"
-
-_git_root=$(git rev-parse --show-toplevel 2>/dev/null || hg root 2>/dev/null || echo "$PWD")
-git_root="$_git_root"
-remote_addr=""
-if [ "$git_root" = "$PWD" ];
-then
-  git_root="."
-fi
-
-url_o=""
-pr_o=""
-build_o=""
-commit_o=""
-search_in_o=""
-tag_o=""
-branch_o=""
-slug_o=""
-prefix_o=""
-git_ls_files_recurse_submodules_o=""
-
-commit="$VCS_COMMIT_ID"
-branch="$VCS_BRANCH_NAME"
-pr="$VCS_PULL_REQUEST"
-slug="$VCS_SLUG"
-tag="$VCS_TAG"
-build_url="$CI_BUILD_URL"
-build="$CI_BUILD_ID"
-job="$CI_JOB_ID"
-
-beta_xcode_partials=""
-
-proj_root="$git_root"
-gcov_exe="gcov"
-gcov_arg=""
-
-b="\033[0;36m"
-g="\033[0;32m"
-r="\033[0;31m"
-e="\033[0;90m"
-x="\033[0m"
-
-show_help() {
-cat << EOF
-
-                Codecov Bash $VERSION
-
-          Global report uploading tool for Codecov
-       Documentation at https://docs.codecov.io/docs
-    Contribute at https://github.com/codecov/codecov-bash
-
-
-    -h          Display this help and exit
-    -f FILE     Target file(s) to upload
-
-                 -f "path/to/file"     only upload this file
-                                       skips searching unless provided patterns below
-
-                 -f '!*.bar'           ignore all files at pattern *.bar
-                 -f '*.foo'            include all files at pattern *.foo
-                 Must use single quotes.
-                 This is non-exclusive, use -s "*.foo" to match specific paths.
-
-    -s DIR       Directory to search for coverage reports.
-                 Already searches project root and artifact folders.
-    -t TOKEN     Set the private repository token
-                 (option) set environment variable CODECOV_TOKEN=:uuid
-
-                 -t @/path/to/token_file
-                 -t uuid
-
-    -n NAME      Custom defined name of the upload. Visible in Codecov UI
-
-    -e ENV       Specify environment variables to be included with this build
-                 Also accepting environment variables: CODECOV_ENV=VAR,VAR2
-
-                 -e VAR,VAR2
-
-    -X feature   Toggle functionalities
-
-                 -X gcov          Disable gcov
-                 -X coveragepy    Disable python coverage
-                 -X fix           Disable report fixing
-                 -X search        Disable searching for reports
-                 -X xcode         Disable xcode processing
-                 -X network       Disable uploading the file network
-                 -X gcovout       Disable gcov output
-                 -X html          Enable coverage for HTML files
-                 -X recursesubs   Enable recurse submodules in git projects when searching for source files
-
-    -N           The commit SHA of the parent for which you are uploading coverage. If not present,
-                 the parent will be determined using the API of your repository provider.
-                 When using the repository provider's API, the parent is determined via finding
-                 the closest ancestor to the commit.
-
-    -R root dir  Used when not in git/hg project to identify project root directory
-    -F flag      Flag the upload to group coverage metrics
-
-                 -F unittests        This upload is only unittests
-                 -F integration      This upload is only integration tests
-                 -F ui,chrome        This upload is Chrome - UI tests
-
-    -c           Move discovered coverage reports to the trash
-    -Z           Exit with 1 if not successful. Default will Exit with 0
-
-    -- xcode --
-    -D           Custom Derived Data Path for Coverage.profdata and gcov processing
-                 Default '~/Library/Developer/Xcode/DerivedData'
-    -J           Specify packages to build coverage. Uploader will only build these packages.
-                 This can significantly reduces time to build coverage reports.
-
-                 -J 'MyAppName'      Will match "MyAppName" and "MyAppNameTests"
-                 -J '^ExampleApp$'   Will match only "ExampleApp" not "ExampleAppTests"
-
-    -- gcov --
-    -g GLOB      Paths to ignore during gcov gathering
-    -G GLOB      Paths to include during gcov gathering
-    -p dir       Project root directory
-                 Also used when preparing gcov
-    -k prefix    Prefix filepaths to help resolve path fixing: https://github.com/codecov/support/issues/472
-    -x gcovexe   gcov executable to run. Defaults to 'gcov'
-    -a gcovargs  extra arguments to pass to gcov
-
-    -- Override CI Environment Variables --
-       These variables are automatically detected by popular CI providers
-
-    -B branch    Specify the branch name
-    -C sha       Specify the commit sha
-    -P pr        Specify the pull request number
-    -b build     Specify the build number
-    -T tag       Specify the git tag
-
-    -- Enterprise --
-    -u URL       Set the target url for Enterprise customers
-                 Not required when retrieving the bash uploader from your CCE
-                 (option) Set environment variable CODECOV_URL=https://my-hosted-codecov.com
-    -r SLUG      owner/repo slug used instead of the private repo token in Enterprise
-                 (option) set environment variable CODECOV_SLUG=:owner/:repo
-                 (option) set in your codecov.yml "codecov.slug"
-    -S PATH      File path to your cacert.pem file used to verify ssl with Codecov Enterprise (optional)
-                 (option) Set environment variable: CODECOV_CA_BUNDLE="/path/to/ca.pem"
-    -U curlargs  Extra curl arguments to communicate with Codecov. e.g., -U "--proxy http://http-proxy"
-    -A curlargs  Extra curl arguments to communicate with AWS.
-
-    -- Debugging --
-    -d           Don't upload, but dump upload file to stdout
-    -q PATH      Write upload file to path
-    -K           Remove color from the output
-    -v           Verbose mode
-
-EOF
-}
-
-
-say() {
-  echo -e "$1"
-}
-
-
-urlencode() {
-  echo "$1" | curl -Gso /dev/null -w "%{url_effective}" --data-urlencode @- "" | cut -c 3- | sed -e 's/%0A//'
-}
-
-
-swiftcov() {
-  _dir=$(dirname "$1" | sed 's/\(Build\).*/\1/g')
-  for _type in app framework xctest
-  do
-    find "$_dir" -name "*.$_type" | while read -r f
-    do
-      _proj=${f##*/}
-      _proj=${_proj%."$_type"}
-      if [ "$2" = "" ] || [ "$(echo "$_proj" | grep -i "$2")" != "" ];
-      then
-        say "    $g+$x Building reports for $_proj $_type"
-        dest=$([ -f "$f/$_proj" ] && echo "$f/$_proj" || echo "$f/Contents/MacOS/$_proj")
-        # shellcheck disable=SC2001
-        _proj_name=$(echo "$_proj" | sed -e 's/[[:space:]]//g')
-        # shellcheck disable=SC2086
-        xcrun llvm-cov show $beta_xcode_partials -instr-profile "$1" "$dest" > "$_proj_name.$_type.coverage.txt" \
-         || say "    ${r}x>${x} llvm-cov failed to produce results for $dest"
-      fi
-    done
-  done
-}
-
-
-# Credits to: https://gist.github.com/pkuczynski/8665367
-parse_yaml() {
-   local prefix=$2
-   local s='[[:space:]]*' w='[a-zA-Z0-9_]*'
-   local fs
-   fs=$(echo @|tr @ '\034')
-   sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
-        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" |
-   awk -F"$fs" '{
-      indent = length($1)/2;
-      vname[indent] = $2;
-      for (i in vname) {if (i > indent) {delete vname[i]}}
-      if (length($3) > 0) {
-         vn=""; if (indent > 0) {vn=(vn)(vname[0])("_")}
-         printf("%s%s%s=\"%s\"\n", "'"$prefix"'",vn, $2, $3);
-      }
-   }'
-}
-
-
-if [ $# != 0 ];
-then
-  while getopts "a:A:b:B:cC:dD:e:f:F:g:G:hJ:k:Kn:p:P:q:r:R:s:S:t:T:u:U:vx:X:ZN:" o
-  do
-    codecov_flags+=( "$o" )
-    case "$o" in
-      "N")
-        parent=$OPTARG
-        ;;
-      "a")
-        gcov_arg=$OPTARG
-        ;;
-      "A")
-        curlawsargs="$OPTARG"
-        ;;
-      "b")
-        build_o="$OPTARG"
-        ;;
-      "B")
-        branch_o="$OPTARG"
-        ;;
-      "c")
-        clean="1"
-        ;;
-      "C")
-        commit_o="$OPTARG"
-        ;;
-      "d")
-        dump="1"
-        ;;
-      "D")
-        ddp="$OPTARG"
-        ;;
-      "e")
-        env="$env,$OPTARG"
-        ;;
-      "f")
-        if [ "${OPTARG::1}" = "!" ];
-        then
-          exclude_cov="$exclude_cov -not -path '${OPTARG:1}'"
-
-        elif [[ "$OPTARG" = *"*"* ]];
-        then
-          include_cov="$include_cov -or -name '$OPTARG'"
-
-        else
-          ft_search=0
-          if [ "$files" = "" ];
-          then
-            files="$OPTARG"
-          else
-            files="$files
-$OPTARG"
-          fi
-        fi
-        ;;
-      "F")
-        if [ "$flags" = "" ];
-        then
-          flags="$OPTARG"
-        else
-          flags="$flags,$OPTARG"
-        fi
-        ;;
-      "g")
-        gcov_ignore="$gcov_ignore -not -path '$OPTARG'"
-        ;;
-      "G")
-        gcov_include="$gcov_include -path '$OPTARG'"
-        ;;
-      "h")
-        show_help
-        exit 0;
-        ;;
-      "J")
-        ft_xcodellvm="1"
-        ft_xcodeplist="0"
-        if [ "$xp" = "" ];
-        then
-          xp="$OPTARG"
-        else
-          xp="$xp\|$OPTARG"
-        fi
-        ;;
-      "k")
-        prefix_o=$(echo "$OPTARG" | sed -e 's:^/*::' -e 's:/*$::')
-        ;;
-      "K")
-        b=""
-        g=""
-        r=""
-        e=""
-        x=""
-        ;;
-      "n")
-        name="$OPTARG"
-        ;;
-      "p")
-        proj_root="$OPTARG"
-        ;;
-      "P")
-        pr_o="$OPTARG"
-        ;;
-      "q")
-        save_to="$OPTARG"
-        ;;
-      "r")
-        slug_o="$OPTARG"
-        ;;
-      "R")
-        git_root="$OPTARG"
-        ;;
-      "s")
-        if [ "$search_in_o" = "" ];
-        then
-          search_in_o="$OPTARG"
-        else
-          search_in_o="$search_in_o $OPTARG"
-        fi
-        ;;
-      "S")
-        # shellcheck disable=SC2089
-        cacert="--cacert \"$OPTARG\""
-        ;;
-      "t")
-        if [ "${OPTARG::1}" = "@" ];
-        then
-          token=$(< "${OPTARG:1}" tr -d ' \n')
-        else
-          token="$OPTARG"
-        fi
-        ;;
-      "T")
-        tag_o="$OPTARG"
-        ;;
-      "u")
-        url_o=$(echo "$OPTARG" | sed -e 's/\/$//')
-        ;;
-      "U")
-        curlargs="$OPTARG"
-        ;;
-      "v")
-        set -x
-        curl_s=""
-        ;;
-      "x")
-        gcov_exe=$OPTARG
-        ;;
-      "X")
-        if [ "$OPTARG" = "gcov" ];
-        then
-          ft_gcov="0"
-        elif [ "$OPTARG" = "coveragepy" ] || [ "$OPTARG" = "py" ];
-        then
-          ft_coveragepy="0"
-        elif [ "$OPTARG" = "gcovout" ];
-        then
-          ft_gcovout="0"
-        elif [ "$OPTARG" = "xcodellvm" ];
-        then
-          ft_xcodellvm="1"
-          ft_xcodeplist="0"
-        elif [ "$OPTARG" = "fix" ] || [ "$OPTARG" = "fixes" ];
-        then
-          ft_fix="0"
-        elif [ "$OPTARG" = "xcode" ];
-        then
-          ft_xcodellvm="0"
-          ft_xcodeplist="0"
-        elif [ "$OPTARG" = "search" ];
-        then
-          ft_search="0"
-        elif [ "$OPTARG" = "xcodepartials" ];
-        then
-          beta_xcode_partials="-use-color"
-        elif [ "$OPTARG" = "network" ];
-        then
-          ft_network="0"
-        elif [ "$OPTARG" = "s3" ];
-        then
-          ft_s3="0"
-        elif [ "$OPTARG" = "html" ];
-        then
-          ft_html="1"
-        elif [ "$OPTARG" = "recursesubs" ];
-        then
-          git_ls_files_recurse_submodules_o="--recurse-submodules"
-        fi
-        ;;
-      "Z")
-        exit_with=1
-        ;;
-      *)
-        echo -e "${r}Unexpected flag not supported${x}"
-        ;;
-    esac
-  done
-fi
-
-say "
-  _____          _
- / ____|        | |
-| |     ___   __| | ___  ___ _____   __
-| |    / _ \\ / _\` |/ _ \\/ __/ _ \\ \\ / /
-| |___| (_) | (_| |  __/ (_| (_) \\ V /
- \\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
-                              Bash-$VERSION
-
-"
-
-search_in="$proj_root"
-
-#shellcheck disable=SC2154
-if [ "$JENKINS_URL" != "" ];
-then
-  say "$e==>$x Jenkins CI detected."
-  # https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project
-  # https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin#GitHubpullrequestbuilderplugin-EnvironmentVariables
-  service="jenkins"
-
-  # shellcheck disable=SC2154
-  if [ "$ghprbSourceBranch" != "" ];
-  then
-     branch="$ghprbSourceBranch"
-  elif [ "$GIT_BRANCH" != "" ];
-  then
-     branch="$GIT_BRANCH"
-  elif [ "$BRANCH_NAME" != "" ];
-  then
-    branch="$BRANCH_NAME"
-  fi
-
-  # shellcheck disable=SC2154
-  if [ "$ghprbActualCommit" != "" ];
-  then
-    commit="$ghprbActualCommit"
-  elif [ "$GIT_COMMIT" != "" ];
-  then
-    commit="$GIT_COMMIT"
-  fi
-
-  # shellcheck disable=SC2154
-  if [ "$ghprbPullId" != "" ];
-  then
-    pr="$ghprbPullId"
-  elif [ "$CHANGE_ID" != "" ];
-  then
-    pr="$CHANGE_ID"
-  fi
-
-  build="$BUILD_NUMBER"
-  # shellcheck disable=SC2153
-  build_url=$(urlencode "$BUILD_URL")
-
-elif [ "$CI" = "true" ] && [ "$TRAVIS" = "true" ] && [ "$SHIPPABLE" != "true" ];
-then
-  say "$e==>$x Travis CI detected."
-  # https://docs.travis-ci.com/user/environment-variables/
-  service="travis"
-  commit="${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT}"
-  build="$TRAVIS_JOB_NUMBER"
-  pr="$TRAVIS_PULL_REQUEST"
-  job="$TRAVIS_JOB_ID"
-  slug="$TRAVIS_REPO_SLUG"
-  env="$env,TRAVIS_OS_NAME"
-  tag="$TRAVIS_TAG"
-  if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ];
-  then
-    branch="$TRAVIS_BRANCH"
-  fi
-
-  language=$(compgen -A variable | grep "^TRAVIS_.*_VERSION$" | head -1)
-  if [ "$language" != "" ];
-  then
-    env="$env,${!language}"
-  fi
-
-elif [ "$CODEBUILD_CI" = "true" ];
-then
-  say "$e==>$x AWS Codebuild detected."
-  # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
-  service="codebuild"
-  commit="$CODEBUILD_RESOLVED_SOURCE_VERSION"
-  build="$CODEBUILD_BUILD_ID"
-  branch="$(echo "$CODEBUILD_WEBHOOK_HEAD_REF" | sed 's/^refs\/heads\///')"
-  if [ "${CODEBUILD_SOURCE_VERSION/pr}" = "$CODEBUILD_SOURCE_VERSION" ] ; then
-    pr="false"
-  else
-    pr="$(echo "$CODEBUILD_SOURCE_VERSION" | sed 's/^pr\///')"
-  fi
-  job="$CODEBUILD_BUILD_ID"
-  slug="$(echo "$CODEBUILD_SOURCE_REPO_URL" | sed 's/^.*:\/\/[^\/]*\///' | sed 's/\.git$//')"
-
-elif [ "$DOCKER_REPO" != "" ];
-then
-  say "$e==>$x Docker detected."
-  # https://docs.docker.com/docker-cloud/builds/advanced/
-  service="docker"
-  branch="$SOURCE_BRANCH"
-  commit="$SOURCE_COMMIT"
-  slug="$DOCKER_REPO"
-  tag="$CACHE_TAG"
-  env="$env,IMAGE_NAME"
-
-elif [ "$CI" = "true" ] && [ "$CI_NAME" = "codeship" ];
-then
-  say "$e==>$x Codeship CI detected."
-  # https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
-  service="codeship"
-  branch="$CI_BRANCH"
-  build="$CI_BUILD_NUMBER"
-  build_url=$(urlencode "$CI_BUILD_URL")
-  commit="$CI_COMMIT_ID"
-
-elif [ -n "$CF_BUILD_URL" ] && [ -n "$CF_BUILD_ID" ];
-then
-  say "$e==>$x Codefresh CI detected."
-  # https://docs.codefresh.io/v1.0/docs/variables
-  service="codefresh"
-  branch="$CF_BRANCH"
-  build="$CF_BUILD_ID"
-  build_url=$(urlencode "$CF_BUILD_URL")
-  commit="$CF_REVISION"
-
-elif [ "$TEAMCITY_VERSION" != "" ];
-then
-  say "$e==>$x TeamCity CI detected."
-  # https://confluence.jetbrains.com/display/TCD8/Predefined+Build+Parameters
-  # https://confluence.jetbrains.com/plugins/servlet/mobile#content/view/74847298
-  if [ "$TEAMCITY_BUILD_BRANCH" = '' ];
-  then
-    echo "    Teamcity does not automatically make build parameters available as environment variables."
-    echo "    Add the following environment parameters to the build configuration"
-    echo "    env.TEAMCITY_BUILD_BRANCH = %teamcity.build.branch%"
-    echo "    env.TEAMCITY_BUILD_ID = %teamcity.build.id%"
-    echo "    env.TEAMCITY_BUILD_URL = %teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%"
-    echo "    env.TEAMCITY_BUILD_COMMIT = %system.build.vcs.number%"
-    echo "    env.TEAMCITY_BUILD_REPOSITORY = %vcsroot.<YOUR TEAMCITY VCS NAME>.url%"
-  fi
-  service="teamcity"
-  branch="$TEAMCITY_BUILD_BRANCH"
-  build="$TEAMCITY_BUILD_ID"
-  build_url=$(urlencode "$TEAMCITY_BUILD_URL")
-  if [ "$TEAMCITY_BUILD_COMMIT" != "" ];
-  then
-    commit="$TEAMCITY_BUILD_COMMIT"
-  else
-    commit="$BUILD_VCS_NUMBER"
-  fi
-  remote_addr="$TEAMCITY_BUILD_REPOSITORY"
-
-elif [ "$CI" = "true" ] && [ "$CIRCLECI" = "true" ];
-then
-  say "$e==>$x Circle CI detected."
-  # https://circleci.com/docs/environment-variables
-  service="circleci"
-  branch="$CIRCLE_BRANCH"
-  build="$CIRCLE_BUILD_NUM"
-  job="$CIRCLE_NODE_INDEX"
-  if [ "$CIRCLE_PROJECT_REPONAME" != "" ];
-  then
-    slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
-  else
-    # git@github.com:owner/repo.git
-    slug="${CIRCLE_REPOSITORY_URL##*:}"
-    # owner/repo.git
-    slug="${slug%%.git}"
-  fi
-  pr="$CIRCLE_PR_NUMBER"
-  commit="$CIRCLE_SHA1"
-  search_in="$search_in $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS"
-
-elif [ "$BUDDYBUILD_BRANCH" != "" ];
-then
-  say "$e==>$x buddybuild detected"
-  # http://docs.buddybuild.com/v6/docs/custom-prebuild-and-postbuild-steps
-  service="buddybuild"
-  branch="$BUDDYBUILD_BRANCH"
-  build="$BUDDYBUILD_BUILD_NUMBER"
-  build_url="https://dashboard.buddybuild.com/public/apps/$BUDDYBUILD_APP_ID/build/$BUDDYBUILD_BUILD_ID"
-  # BUDDYBUILD_TRIGGERED_BY
-  if [ "$ddp" = "$HOME/Library/Developer/Xcode/DerivedData" ];
-  then
-    ddp="/private/tmp/sandbox/${BUDDYBUILD_APP_ID}/bbtest"
-  fi
-
-elif [ "${bamboo_planRepository_revision}" != "" ];
-then
-  say "$e==>$x Bamboo detected"
-  # https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html#Bamboovariables-Build-specificvariables
-  service="bamboo"
-  commit="${bamboo_planRepository_revision}"
-  # shellcheck disable=SC2154
-  branch="${bamboo_planRepository_branch}"
-  # shellcheck disable=SC2154
-  build="${bamboo_buildNumber}"
-  # shellcheck disable=SC2154
-  build_url="${bamboo_buildResultsUrl}"
-  # shellcheck disable=SC2154
-  remote_addr="${bamboo_planRepository_repositoryUrl}"
-
-elif [ "$CI" = "true" ] && [ "$BITRISE_IO" = "true" ];
-then
-  # http://devcenter.bitrise.io/faq/available-environment-variables/
-  say "$e==>$x Bitrise CI detected."
-  service="bitrise"
-  branch="$BITRISE_GIT_BRANCH"
-  build="$BITRISE_BUILD_NUMBER"
-  build_url=$(urlencode "$BITRISE_BUILD_URL")
-  pr="$BITRISE_PULL_REQUEST"
-  if [ "$GIT_CLONE_COMMIT_HASH" != "" ];
-  then
-    commit="$GIT_CLONE_COMMIT_HASH"
-  fi
-
-elif [ "$CI" = "true" ] && [ "$SEMAPHORE" = "true" ];
-then
-  say "$e==>$x Semaphore CI detected."
-# https://docs.semaphoreci.com/ci-cd-environment/environment-variables/#semaphore-related
-  service="semaphore"
-  branch="$SEMAPHORE_GIT_BRANCH"
-  build="$SEMAPHORE_WORKFLOW_NUMBER"
-  job="$SEMAPHORE_JOB_ID"
-  pr="$PULL_REQUEST_NUMBER"
-  slug="$SEMAPHORE_REPO_SLUG"
-  commit="$REVISION"
-  env="$env,SEMAPHORE_TRIGGER_SOURCE"
-
-elif [ "$CI" = "true" ] && [ "$BUILDKITE" = "true" ];
-then
-  say "$e==>$x Buildkite CI detected."
-  # https://buildkite.com/docs/guides/environment-variables
-  service="buildkite"
-  branch="$BUILDKITE_BRANCH"
-  build="$BUILDKITE_BUILD_NUMBER"
-  job="$BUILDKITE_JOB_ID"
-  build_url=$(urlencode "$BUILDKITE_BUILD_URL")
-  slug="$BUILDKITE_PROJECT_SLUG"
-  commit="$BUILDKITE_COMMIT"
-  if [[ "$BUILDKITE_PULL_REQUEST" != "false" ]]; then
-    pr="$BUILDKITE_PULL_REQUEST"
-  fi
-  tag="$BUILDKITE_TAG"
-
-elif [ "$CI" = "drone" ] || [ "$DRONE" = "true" ];
-then
-  say "$e==>$x Drone CI detected."
-  # http://docs.drone.io/env.html
-  # drone commits are not full shas
-  service="drone.io"
-  branch="$DRONE_BRANCH"
-  build="$DRONE_BUILD_NUMBER"
-  build_url=$(urlencode "${DRONE_BUILD_LINK}")
-  pr="$DRONE_PULL_REQUEST"
-  job="$DRONE_JOB_NUMBER"
-  tag="$DRONE_TAG"
-
-elif [ "$CI" = "true" ] && [ "$HEROKU_TEST_RUN_BRANCH" != "" ];
-then
-  say "$e==>$x Heroku CI detected."
-  # https://devcenter.heroku.com/articles/heroku-ci#environment-variables
-  service="heroku"
-  branch="$HEROKU_TEST_RUN_BRANCH"
-  build="$HEROKU_TEST_RUN_ID"
-  commit="$HEROKU_TEST_RUN_COMMIT_VERSION"
-
-elif [[ "$CI" = "true" || "$CI" = "True" ]] && [[ "$APPVEYOR" = "true" || "$APPVEYOR" = "True" ]];
-then
-  say "$e==>$x Appveyor CI detected."
-  # http://www.appveyor.com/docs/environment-variables
-  service="appveyor"
-  branch="$APPVEYOR_REPO_BRANCH"
-  build=$(urlencode "$APPVEYOR_JOB_ID")
-  pr="$APPVEYOR_PULL_REQUEST_NUMBER"
-  job="$APPVEYOR_ACCOUNT_NAME%2F$APPVEYOR_PROJECT_SLUG%2F$APPVEYOR_BUILD_VERSION"
-  slug="$APPVEYOR_REPO_NAME"
-  commit="$APPVEYOR_REPO_COMMIT"
-  build_url=$(urlencode "${APPVEYOR_URL}/project/${APPVEYOR_REPO_NAME}/builds/$APPVEYOR_BUILD_ID/job/${APPVEYOR_JOB_ID}")
-
-elif [ "$CI" = "true" ] && [ "$WERCKER_GIT_BRANCH" != "" ];
-then
-  say "$e==>$x Wercker CI detected."
-  # http://devcenter.wercker.com/articles/steps/variables.html
-  service="wercker"
-  branch="$WERCKER_GIT_BRANCH"
-  build="$WERCKER_MAIN_PIPELINE_STARTED"
-  slug="$WERCKER_GIT_OWNER/$WERCKER_GIT_REPOSITORY"
-  commit="$WERCKER_GIT_COMMIT"
-
-elif [ "$CI" = "true" ] && [ "$MAGNUM" = "true" ];
-then
-  say "$e==>$x Magnum CI detected."
-  # https://magnum-ci.com/docs/environment
-  service="magnum"
-  branch="$CI_BRANCH"
-  build="$CI_BUILD_NUMBER"
-  commit="$CI_COMMIT"
-
-elif [ "$SHIPPABLE" = "true" ];
-then
-  say "$e==>$x Shippable CI detected."
-  # http://docs.shippable.com/ci_configure/
-  service="shippable"
-  # shellcheck disable=SC2153
-  branch=$([ "$HEAD_BRANCH" != "" ] && echo "$HEAD_BRANCH" || echo "$BRANCH")
-  build="$BUILD_NUMBER"
-  build_url=$(urlencode "$BUILD_URL")
-  pr="$PULL_REQUEST"
-  slug="$REPO_FULL_NAME"
-  # shellcheck disable=SC2153
-  commit="$COMMIT"
-
-elif [ "$TDDIUM" = "true" ];
-then
-  say "Solano CI detected."
-  # http://docs.solanolabs.com/Setup/tddium-set-environment-variables/
-  service="solano"
-  commit="$TDDIUM_CURRENT_COMMIT"
-  branch="$TDDIUM_CURRENT_BRANCH"
-  build="$TDDIUM_TID"
-  pr="$TDDIUM_PR_ID"
-
-elif [ "$GREENHOUSE" = "true" ];
-then
-  say "$e==>$x Greenhouse CI detected."
-  # http://docs.greenhouseci.com/docs/environment-variables-files
-  service="greenhouse"
-  branch="$GREENHOUSE_BRANCH"
-  build="$GREENHOUSE_BUILD_NUMBER"
-  build_url=$(urlencode "$GREENHOUSE_BUILD_URL")
-  pr="$GREENHOUSE_PULL_REQUEST"
-  commit="$GREENHOUSE_COMMIT"
-  search_in="$search_in $GREENHOUSE_EXPORT_DIR"
-
-elif [ "$GITLAB_CI" != "" ];
-then
-  say "$e==>$x GitLab CI detected."
-  # http://doc.gitlab.com/ce/ci/variables/README.html
-  service="gitlab"
-  branch="${CI_BUILD_REF_NAME:-$CI_COMMIT_REF_NAME}"
-  build="${CI_BUILD_ID:-$CI_JOB_ID}"
-  remote_addr="${CI_BUILD_REPO:-$CI_REPOSITORY_URL}"
-  commit="${CI_BUILD_REF:-$CI_COMMIT_SHA}"
-  slug="${CI_PROJECT_PATH}"
-
-elif [ "$GITHUB_ACTIONS" != "" ];
-then
-  say "$e==>$x GitHub Actions detected."
-
-  # https://github.com/features/actions
-  service="github-actions"
-
-  # https://help.github.com/en/articles/virtual-environments-for-github-actions#environment-variables
-  branch="${GITHUB_REF#refs/heads/}"
-  if [  "$GITHUB_HEAD_REF" != "" ];
-  then
-    # PR refs are in the format: refs/pull/7/merge
-    pr="${GITHUB_REF#refs/pull/}"
-    pr="${pr%/merge}"
-    branch="${GITHUB_HEAD_REF}"
-  fi
-  commit="${GITHUB_SHA}"
-  slug="${GITHUB_REPOSITORY}"
-  build="${GITHUB_RUN_ID}"
-  build_url=$(urlencode "http://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}")
-
-elif [ "$SYSTEM_TEAMFOUNDATIONSERVERURI" != "" ];
-then
-  say "$e==>$x Azure Pipelines detected."
-  # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=vsts
-  # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&viewFallbackFrom=vsts&tabs=yaml
-  service="azure_pipelines"
-  commit="$BUILD_SOURCEVERSION"
-  build="$BUILD_BUILDNUMBER"
-  if [  -z "$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" ];
-  then
-    pr="$SYSTEM_PULLREQUEST_PULLREQUESTID"
-  else
-    pr="$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
-  fi
-  project="${SYSTEM_TEAMPROJECT}"
-  server_uri="${SYSTEM_TEAMFOUNDATIONSERVERURI}"
-  job="${BUILD_BUILDID}"
-  branch="$BUILD_SOURCEBRANCHNAME"
-  build_url=$(urlencode "${SYSTEM_TEAMFOUNDATIONSERVERURI}${SYSTEM_TEAMPROJECT}/_build/results?buildId=${BUILD_BUILDID}")
-elif [ "$CI" = "true" ] && [ "$BITBUCKET_BUILD_NUMBER" != "" ];
-then
-  say "$e==>$x Bitbucket detected."
-  # https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
-  service="bitbucket"
-  branch="$BITBUCKET_BRANCH"
-  build="$BITBUCKET_BUILD_NUMBER"
-  slug="$BITBUCKET_REPO_OWNER/$BITBUCKET_REPO_SLUG"
-  job="$BITBUCKET_BUILD_NUMBER"
-  pr="$BITBUCKET_PR_ID"
-  commit="$BITBUCKET_COMMIT"
-  # See https://jira.atlassian.com/browse/BCLOUD-19393
-  if [ "${#commit}" = 12 ];
-  then
-    commit=$(git rev-parse "$BITBUCKET_COMMIT")
-  fi
-elif [ "$CI" = "true" ] && [ "$BUDDY" = "true" ];
-then
-  say "$e==>$x Buddy CI detected."
-  # https://buddy.works/docs/pipelines/environment-variables
-  service="buddy"
-  branch="$BUDDY_EXECUTION_BRANCH"
-  build="$BUDDY_EXECUTION_ID"
-  build_url=$(urlencode "$BUDDY_EXECUTION_URL")
-  commit="$BUDDY_EXECUTION_REVISION"
-  pr="$BUDDY_EXECUTION_PULL_REQUEST_NO"
-  tag="$BUDDY_EXECUTION_TAG"
-  slug="$BUDDY_REPO_SLUG"
-
-elif [ "$CIRRUS_CI" != "" ];
-then
-  say "$e==>$x Cirrus CI detected."
-  # https://cirrus-ci.org/guide/writing-tasks/#environment-variables
-  service="cirrus-ci"
-  slug="$CIRRUS_REPO_FULL_NAME"
-  branch="$CIRRUS_BRANCH"
-  pr="$CIRRUS_PR"
-  commit="$CIRRUS_CHANGE_IN_REPO"
-  build="$CIRRUS_TASK_ID"
-  job="$CIRRUS_TASK_NAME"
-
-else
-  say "${r}x>${x} No CI provider detected."
-  say "    Testing inside Docker? ${b}http://docs.codecov.io/docs/testing-with-docker${x}"
-  say "    Testing with Tox? ${b}https://docs.codecov.io/docs/python#section-testing-with-tox${x}"
-
-fi
-
-say "    ${e}project root:${x} $git_root"
-
-# find branch, commit, repo from git command
-if [ "$GIT_BRANCH" != "" ];
-then
-  branch="$GIT_BRANCH"
-
-elif [ "$branch" = "" ];
-then
-  branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || hg branch 2>/dev/null || echo "")
-  if [ "$branch" = "HEAD" ];
-  then
-    branch=""
-  fi
-fi
-
-if [ "$commit_o" = "" ];
-then
-  # merge commit -> actual commit
-  mc=
-  if [ -n "$pr" ] && [ "$pr" != false ];
-  then
-    mc=$(git show --no-patch --format="%P" 2>/dev/null || echo "")
-  fi
-  if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
-  then
-    say "    Fixing merge commit SHA"
-    commit=$(echo "$mc" | cut -d' ' -f2)
-  elif [ "$GIT_COMMIT" != "" ];
-  then
-    commit="$GIT_COMMIT"
-  elif [ "$commit" = "" ];
-  then
-    commit=$(git log -1 --format="%H" 2>/dev/null || hg id -i --debug 2>/dev/null | tr -d '+' || echo "")
-  fi
-else
-  commit="$commit_o"
-fi
-
-if [ "$CODECOV_TOKEN" != "" ] && [ "$token" = "" ];
-then
-  say "${e}-->${x} token set from env"
-  token="$CODECOV_TOKEN"
-fi
-
-if [ "$CODECOV_URL" != "" ] && [ "$url_o" = "" ];
-then
-  say "${e}-->${x} url set from env"
-  url_o=$(echo "$CODECOV_URL" | sed -e 's/\/$//')
-fi
-
-if [ "$CODECOV_SLUG" != "" ];
-then
-  say "${e}-->${x} slug set from env"
-  slug_o="$CODECOV_SLUG"
-
-elif [ "$slug" = "" ];
-then
-  if [ "$remote_addr" = "" ];
-  then
-    remote_addr=$(git config --get remote.origin.url || hg paths default || echo '')
-  fi
-  if [ "$remote_addr" != "" ];
-  then
-    if echo "$remote_addr" | grep -q "//"; then
-      # https
-      slug=$(echo "$remote_addr" | cut -d / -f 4,5 | sed -e 's/\.git$//')
-    else
-      # ssh
-      slug=$(echo "$remote_addr" | cut -d : -f 2 | sed -e 's/\.git$//')
-    fi
-  fi
-  if [ "$slug" = "/" ];
-  then
-    slug=""
-  fi
-fi
-
-yaml=$(cd "$git_root" && \
-          git ls-files "*codecov.yml" "*codecov.yaml" 2>/dev/null \
-       || hg locate "*codecov.yml" "*codecov.yaml" 2>/dev/null \
-       || cd "$proj_root" && find . -maxdepth 1 -type f -name '*codecov.y*ml' 2>/dev/null \
-       || echo '')
-yaml=$(echo "$yaml" | head -1)
-
-if [ "$yaml" != "" ];
-then
-  say "    ${e}Yaml found at:${x} $yaml"
-  if [[ "$yaml" != /* ]]; then
-    # relative path for yaml file given, assume relative to the repo root
-    yaml="$git_root/$yaml"
-  fi
-  config=$(parse_yaml "$yaml" || echo '')
-
-  # TODO validate the yaml here
-
-  if [ "$(echo "$config" | grep 'codecov_token="')" != "" ] && [ "$token" = "" ];
-  then
-    say "${e}-->${x} token set from yaml"
-    token="$(echo "$config" | grep 'codecov_token="' | sed -e 's/codecov_token="//' | sed -e 's/"\.*//')"
-  fi
-
-  if [ "$(echo "$config" | grep 'codecov_url="')" != "" ] && [ "$url_o" = "" ];
-  then
-    say "${e}-->${x} url set from yaml"
-    url_o="$(echo "$config" | grep 'codecov_url="' | sed -e 's/codecov_url="//' | sed -e 's/"\.*//')"
-  fi
-
-  if [ "$(echo "$config" | grep 'codecov_slug="')" != "" ] && [ "$slug_o" = "" ];
-  then
-    say "${e}-->${x} slug set from yaml"
-    slug_o="$(echo "$config" | grep 'codecov_slug="' | sed -e 's/codecov_slug="//' | sed -e 's/"\.*//')"
-  fi
-else
-  say "    ${g}Yaml not found, that's ok! Learn more at${x} ${b}http://docs.codecov.io/docs/codecov-yaml${x}"
-fi
-
-if [ "$branch_o" != "" ];
-then
-  branch=$(urlencode "$branch_o")
-else
-  branch=$(urlencode "$branch")
-fi
-
-if [ "$slug_o" = "" ];
-then
-  urlencoded_slug=$(urlencode "$slug")
-else
-  urlencoded_slug=$(urlencode "$slug_o")
-fi
-
-query="branch=$branch\
-       &commit=$commit\
-       &build=$([ "$build_o" = "" ] && echo "$build" || echo "$build_o")\
-       &build_url=$build_url\
-       &name=$(urlencode "$name")\
-       &tag=$([ "$tag_o" = "" ] && echo "$tag" || echo "$tag_o")\
-       &slug=$urlencoded_slug\
-       &service=$service\
-       &flags=$flags\
-       &pr=$([ "$pr_o" = "" ] && echo "${pr##\#}" || echo "${pr_o##\#}")\
-       &job=$job\
-       &cmd_args=$(IFS=,; echo "${codecov_flags[*]}")"
-
-if [ -n "$project" ] && [ -n "$server_uri" ];
-then
-  query=$(echo "$query&project=$project&server_uri=$server_uri" | tr -d ' ')
-fi
-
-if [ "$parent" != "" ];
-then
-  query=$(echo "parent=$parent&$query" | tr -d ' ')
-fi
-
-if [ "$ft_search" = "1" ];
-then
-  # detect bower comoponents location
-  bower_components="bower_components"
-  bower_rc=$(cd "$git_root" && cat .bowerrc 2>/dev/null || echo "")
-  if [ "$bower_rc" != "" ];
-  then
-    bower_components=$(echo "$bower_rc" | tr -d '\n' | grep '"directory"' | cut -d'"' -f4 | sed -e 's/\/$//')
-    if [ "$bower_components" = "" ];
-    then
-      bower_components="bower_components"
-    fi
-  fi
-
-  # Swift Coverage
-  if [ "$ft_xcodellvm" = "1" ] && [ -d "$ddp" ];
-  then
-    say "${e}==>${x} Processing Xcode reports via llvm-cov"
-    say "    DerivedData folder: $ddp"
-    profdata_files=$(find "$ddp" -name '*.profdata' 2>/dev/null || echo '')
-    if [ "$profdata_files" != "" ];
-    then
-      # xcode via profdata
-      if [ "$xp" = "" ];
-      then
-        # xp=$(xcodebuild -showBuildSettings 2>/dev/null | grep -i "^\s*PRODUCT_NAME" | sed -e 's/.*= \(.*\)/\1/')
-        # say " ${e}->${x} Speed up Xcode processing by adding ${e}-J '$xp'${x}"
-        say "    ${g}hint${x} Speed up Swift processing by using use ${g}-J 'AppName'${x} (regexp accepted)"
-        say "    ${g}hint${x} This will remove Pods/ from your report. Also ${b}https://docs.codecov.io/docs/ignoring-paths${x}"
-      fi
-      while read -r profdata;
-      do
-        if [ "$profdata" != "" ];
-        then
-          swiftcov "$profdata" "$xp"
-        fi
-      done <<< "$profdata_files"
-    else
-      say "    ${e}->${x} No Swift coverage found"
-    fi
-
-    # Obj-C Gcov Coverage
-    if [ "$ft_gcov" = "1" ];
-    then
-      say "    ${e}->${x} Running $gcov_exe for Obj-C"
-      if [ "$ft_gcovout" = "0" ];
-      then
-        # suppress gcov output
-        bash -c "find $ddp -type f -name '*.gcda' $gcov_include $gcov_ignore -exec $gcov_exe -p $gcov_arg {} +" >/dev/null 2>&1 || true
-      else
-        bash -c "find $ddp -type f -name '*.gcda' $gcov_include $gcov_ignore -exec $gcov_exe -p $gcov_arg {} +" || true
-      fi
-    fi
-  fi
-
-  if [ "$ft_xcodeplist" = "1" ] && [ -d "$ddp" ];
-  then
-    say "${e}==>${x} Processing Xcode plists"
-    plists_files=$(find "$ddp" -name '*.xccoverage' 2>/dev/null || echo '')
-    if [ "$plists_files" != "" ];
-    then
-      while read -r plist;
-      do
-        if [ "$plist" != "" ];
-        then
-          say "    ${g}Found${x} plist file at $plist"
-          plutil -convert xml1 -o "$(basename "$plist").plist" -- "$plist"
-        fi
-      done <<< "$plists_files"
-    fi
-  fi
-
-  # Gcov Coverage
-  if [ "$ft_gcov" = "1" ];
-  then
-    say "${e}==>${x} Running $gcov_exe in $proj_root ${e}(disable via -X gcov)${x}"
-    if [ "$ft_gcovout" = "0" ];
-    then
-      # suppress gcov output
-      bash -c "find $proj_root -type f -name '*.gcno' $gcov_include $gcov_ignore -exec $gcov_exe -pb $gcov_arg {} +" >/dev/null 2>&1 || true
-    else
-      bash -c "find $proj_root -type f -name '*.gcno' $gcov_include $gcov_ignore -exec $gcov_exe -pb $gcov_arg {} +" || true
-    fi
-  else
-    say "${e}==>${x} gcov disabled"
-  fi
-
-  # Python Coverage
-  if [ "$ft_coveragepy" = "1" ];
-  then
-    if [ ! -f coverage.xml ];
-    then
-      if command -v coverage >/dev/null 2>&1;
-      then
-        say "${e}==>${x} Python coveragepy exists ${e}disable via -X coveragepy${x}"
-
-        dotcoverage=$(find "$git_root" -name '.coverage' -or -name '.coverage.*' | head -1 || echo '')
-        if [ "$dotcoverage" != "" ];
-        then
-          cd "$(dirname "$dotcoverage")"
-          if [ ! -f .coverage ];
-          then
-            say "    ${e}->${x} Running coverage combine"
-            coverage combine -a
-          fi
-          say "    ${e}->${x} Running coverage xml"
-          if [ "$(coverage xml -i)" != "No data to report." ];
-          then
-            files="$files
-$PWD/coverage.xml"
-          else
-            say "    ${r}No data to report.${x}"
-          fi
-          cd "$proj_root"
-        else
-          say "    ${r}No .coverage file found.${x}"
-        fi
-      else
-        say "${e}==>${x} Python coveragepy not found"
-      fi
-    fi
-  else
-    say "${e}==>${x} Python coveragepy disabled"
-  fi
-
-  if [ "$search_in_o" != "" ];
-  then
-    # location override
-    search_in="$search_in_o"
-  fi
-
-  say "$e==>$x Searching for coverage reports in:"
-  for _path in $search_in
-  do
-    say "    ${g}+${x} $_path"
-  done
-
-  patterns="find $search_in \( \
-                        -name vendor \
-                        -or -name htmlcov \
-                        -or -name virtualenv \
-                        -or -name js/generated/coverage \
-                        -or -name .virtualenv \
-                        -or -name virtualenvs \
-                        -or -name .virtualenvs \
-                        -or -name .env \
-                        -or -name .envs \
-                        -or -name env \
-                        -or -name .yarn-cache \
-                        -or -name envs \
-                        -or -name .venv \
-                        -or -name .venvs \
-                        -or -name venv \
-                        -or -name venvs \
-                        -or -name .git \
-                        -or -name .hg \
-                        -or -name .tox \
-                        -or -name __pycache__ \
-                        -or -name '.egg-info*' \
-                        -or -name '$bower_components' \
-                        -or -name node_modules \
-                        -or -name 'conftest_*.c.gcov' \
-                    \) -prune -or \
-                    -type f \( -name '*coverage*.*' \
-                     -or -name '*.clover' \
-                     -or -name '*.codecov.*' \
-                     -or -name '*.gcov' \
-                     -or -name '*.lcov' \
-                     -or -name '*.lst' \
-                     -or -name 'clover.xml' \
-                     -or -name 'cobertura.xml' \
-                     -or -name 'codecov.*' \
-                     -or -name 'cover.out' \
-                     -or -name 'coverage-final.json' \
-                     -or -name 'excoveralls.json' \
-                     -or -name 'gcov.info' \
-                     -or -name 'jacoco*.xml' \
-                     -or -name '*Jacoco*.xml' \
-                     -or -name 'lcov.dat' \
-                     -or -name 'lcov.info' \
-                     -or -name 'luacov.report.out' \
-                     -or -name 'naxsi.info' \
-                     -or -name 'nosetests.xml' \
-                     -or -name 'report.xml' \
-                     $include_cov \) \
-                    $exclude_cov \
-                    -not -name '*.am' \
-                    -not -name '*.bash' \
-                    -not -name '*.bat' \
-                    -not -name '*.bw' \
-                    -not -name '*.cfg' \
-                    -not -name '*.class' \
-                    -not -name '*.cmake' \
-                    -not -name '*.cmake' \
-                    -not -name '*.conf' \
-                    -not -name '*.coverage' \
-                    -not -name '*.cp' \
-                    -not -name '*.cpp' \
-                    -not -name '*.crt' \
-                    -not -name '*.css' \
-                    -not -name '*.csv' \
-                    -not -name '*.csv' \
-                    -not -name '*.data' \
-                    -not -name '*.db' \
-                    -not -name '*.dox' \
-                    -not -name '*.ec' \
-                    -not -name '*.ec' \
-                    -not -name '*.egg' \
-                    -not -name '*.el' \
-                    -not -name '*.env' \
-                    -not -name '*.erb' \
-                    -not -name '*.exe' \
-                    -not -name '*.ftl' \
-                    -not -name '*.gif' \
-                    -not -name '*.gradle' \
-                    -not -name '*.gz' \
-                    -not -name '*.h' \
-                    -not -name '*.html' \
-                    -not -name '*.in' \
-                    -not -name '*.jade' \
-                    -not -name '*.jar*' \
-                    -not -name '*.jpeg' \
-                    -not -name '*.jpg' \
-                    -not -name '*.js' \
-                    -not -name '*.less' \
-                    -not -name '*.log' \
-                    -not -name '*.m4' \
-                    -not -name '*.mak*' \
-                    -not -name '*.md' \
-                    -not -name '*.o' \
-                    -not -name '*.p12' \
-                    -not -name '*.pem' \
-                    -not -name '*.png' \
-                    -not -name '*.pom*' \
-                    -not -name '*.profdata' \
-                    -not -name '*.proto' \
-                    -not -name '*.ps1' \
-                    -not -name '*.pth' \
-                    -not -name '*.py' \
-                    -not -name '*.pyc' \
-                    -not -name '*.pyo' \
-                    -not -name '*.rb' \
-                    -not -name '*.rsp' \
-                    -not -name '*.rst' \
-                    -not -name '*.ru' \
-                    -not -name '*.sbt' \
-                    -not -name '*.scss' \
-                    -not -name '*.scss' \
-                    -not -name '*.serialized' \
-                    -not -name '*.sh' \
-                    -not -name '*.snapshot' \
-                    -not -name '*.sql' \
-                    -not -name '*.svg' \
-                    -not -name '*.tar.tz' \
-                    -not -name '*.template' \
-                    -not -name '*.whl' \
-                    -not -name '*.xcconfig' \
-                    -not -name '*.xcoverage.*' \
-                    -not -name '*/classycle/report.xml' \
-                    -not -name '*codecov.yml' \
-                    -not -name '*~' \
-                    -not -name '.*coveragerc' \
-                    -not -name '.coverage*' \
-                    -not -name 'coverage-summary.json' \
-                    -not -name 'createdFiles.lst' \
-                    -not -name 'fullLocaleNames.lst' \
-                    -not -name 'include.lst' \
-                    -not -name 'inputFiles.lst' \
-                    -not -name 'phpunit-code-coverage.xml' \
-                    -not -name 'phpunit-coverage.xml' \
-                    -not -name 'remapInstanbul.coverage*.json' \
-                    -not -name 'scoverage.measurements.*' \
-                    -not -name 'test_*_coverage.txt' \
-                    -not -name 'testrunner-coverage*' \
-                    -print 2>/dev/null"
-  files=$(eval "$patterns" || echo '')
-
-elif [ "$include_cov" != "" ];
-then
-  files=$(eval "find $search_in -type f \( ${include_cov:5} \)$exclude_cov 2>/dev/null" || echo '')
-fi
-
-num_of_files=$(echo "$files" | wc -l | tr -d ' ')
-if [ "$num_of_files" != '' ] && [ "$files" != '' ];
-then
-  say "    ${e}->${x} Found $num_of_files reports"
-fi
-
-# no files found
-if [ "$files" = "" ];
-then
-  say "${r}-->${x} No coverage report found."
-  say "    Please visit ${b}http://docs.codecov.io/docs/supported-languages${x}"
-  exit ${exit_with};
-fi
-
-if [ "$ft_network" == "1" ];
-then
-  say "${e}==>${x} Detecting git/mercurial file structure"
-  network=$(cd "$git_root" && git ls-files $git_ls_files_recurse_submodules_o 2>/dev/null || hg locate 2>/dev/null || echo "")
-  if [ "$network" = "" ];
-  then
-    network=$(find "$git_root" \( \
-                   -name virtualenv \
-                   -name .virtualenv \
-                   -name virtualenvs \
-                   -name .virtualenvs \
-                   -name '*.png' \
-                   -name '*.gif' \
-                   -name '*.jpg' \
-                   -name '*.jpeg' \
-                   -name '*.md' \
-                   -name .env \
-                   -name .envs \
-                   -name env \
-                   -name envs \
-                   -name .venv \
-                   -name .venvs \
-                   -name venv \
-                   -name venvs \
-                   -name .git \
-                   -name .egg-info \
-                   -name shunit2-2.1.6 \
-                   -name vendor \
-                   -name __pycache__ \
-                   -name node_modules \
-                   -path "*/$bower_components/*" \
-                   -path '*/target/delombok/*' \
-                   -path '*/build/lib/*' \
-                   -path '*/js/generated/coverage/*' \
-                    \) -prune -or \
-                    -type f -print 2>/dev/null || echo '')
-  fi
-
-  if [ "$prefix_o" != "" ];
-  then
-      network=$(echo "$network" | awk "{print \"$prefix_o/\"\$0}")
-  fi
-fi
-
-upload_file=$(mktemp /tmp/codecov.XXXXXX)
-adjustments_file=$(mktemp /tmp/codecov.adjustments.XXXXXX)
-
-cleanup() {
-    rm -f "$upload_file" "$adjustments_file" "$upload_file.gz"
-}
-
-trap cleanup INT ABRT TERM
-
-if [ "$env" != "" ];
-then
-  inc_env=""
-  say "${e}==>${x} Appending build variables"
-  for varname in $(echo "$env" | tr ',' ' ')
-  do
-    if [ "$varname" != "" ];
-    then
-      say "    ${g}+${x} $varname"
-      inc_env="${inc_env}${varname}=$(eval echo "\$${varname}")
-"
-    fi
-  done
-
-echo "$inc_env<<<<<< ENV" >> "$upload_file"
-fi
-
-# Append git file list
-# write discovered yaml location
-echo "$yaml" >> "$upload_file"
-if [ "$ft_network" == "1" ];
-then
-  i="woff|eot|otf"  # fonts
-  i="$i|gif|png|jpg|jpeg|psd"  # images
-  i="$i|ptt|pptx|numbers|pages|md|txt|xlsx|docx|doc|pdf|csv"  # docs
-  i="$i|yml|yaml|.gitignore"  # supporting docs
-
-  if [ "$ft_html" != "1" ];
-  then
-    i="$i|html"
-  fi
-
-  echo "$network" | grep -vwE "($i)$" >> "$upload_file"
-fi
-echo "<<<<<< network" >> "$upload_file"
-
-fr=0
-say "${e}==>${x} Reading reports"
-while IFS='' read -r file;
-do
-  # read the coverage file
-  if [ "$(echo "$file" | tr -d ' ')" != '' ];
-  then
-    if [ -f "$file" ];
-    then
-      report_len=$(wc -c < "$file")
-      if [ "$report_len" -ne 0 ];
-      then
-        say "    ${g}+${x} $file ${e}bytes=$(echo "$report_len" | tr -d ' ')${x}"
-        # append to to upload
-        _filename=$(basename "$file")
-        if [ "${_filename##*.}" = 'gcov' ];
-        then
-          {
-            echo "# path=$(echo "$file.reduced" | sed "s|^$git_root/||")";
-            # get file name
-            head -1 "$file";
-          } >> "$upload_file"
-          # 1. remove source code
-          # 2. remove ending bracket lines
-          # 3. remove whitespace
-          # 4. remove contextual lines
-          # 5. remove function names
-          awk -F': *' '{print $1":"$2":"}' "$file" \
-            | sed '\/: *} *$/d' \
-            | sed 's/^ *//' \
-            | sed '/^-/d' \
-            | sed 's/^function.*/func/' >> "$upload_file"
-        else
-          {
-            echo "# path=${file//^$git_root/||}";
-            cat "$file";
-          } >> "$upload_file"
-        fi
-        echo "<<<<<< EOF" >> "$upload_file"
-        fr=1
-        if [ "$clean" = "1" ];
-        then
-          rm "$file"
-        fi
-      else
-        say "    ${r}-${x} Skipping empty file $file"
-      fi
-    else
-      say "    ${r}-${x} file not found at $file"
-    fi
-  fi
-done <<< "$(echo -e "$files")"
-
-if [ "$fr" = "0" ];
-then
-  say "${r}-->${x} No coverage data found."
-  say "    Please visit ${b}http://docs.codecov.io/docs/supported-languages${x}"
-  say "    search for your projects language to learn how to collect reports."
-  exit ${exit_with};
-fi
-
-if [ "$ft_fix" = "1" ];
-then
-  say "${e}==>${x} Appending adjustments"
-  say "    ${b}https://docs.codecov.io/docs/fixing-reports${x}"
-
-  empty_line='^[[:space:]]*$'
-  # //
-  syntax_comment='^[[:space:]]*//.*'
-  # /* or */
-  syntax_comment_block='^[[:space:]]*(\/\*|\*\/)[[:space:]]*$'
-  # { or }
-  syntax_bracket='^[[:space:]]*[\{\}][[:space:]]*(//.*)?$'
-  # [ or ]
-  syntax_list='^[[:space:]]*[][][[:space:]]*(//.*)?$'
-  # func ... {
-  syntax_go_func='^[[:space:]]*[func].*[\{][[:space:]]*$'
-
-  # shellcheck disable=SC2089
-  skip_dirs="-not -path '*/$bower_components/*' \
-             -not -path '*/node_modules/*'"
-
-  cut_and_join() {
-    awk 'BEGIN { FS=":" }
-         $3 ~ /\/\*/ || $3 ~ /\*\// { print $0 ; next }
-         $1!=key { if (key!="") print out ; key=$1 ; out=$1":"$2 ; next }
-         { out=out","$2 }
-         END { print out }' 2>/dev/null
-  }
-
-  if echo "$network" | grep -m1 '.kt$' 1>/dev/null;
-  then
-    # skip brackets and comments
-    cd "$git_root" && \
-      find . -type f \
-             -name '*.kt' \
-             -exec \
-      grep -nIHE -e "$syntax_bracket" \
-                 -e "$syntax_comment_block" {} \; \
-      | cut_and_join \
-      >> "$adjustments_file" \
-      || echo ''
-
-    # last line in file
-    cd "$git_root" && \
-      find . -type f \
-             -name '*.kt' -exec \
-      wc -l {} \; \
-      | while read -r l; do echo "EOF: $l"; done \
-      2>/dev/null \
-      >> "$adjustments_file" \
-      || echo ''
-  fi
-
-  if echo "$network" | grep -m1 '.go$' 1>/dev/null;
-  then
-    # skip empty lines, comments, and brackets
-    cd "$git_root" && \
-      find . -type f \
-             -not -path '*/vendor/*' \
-             -not -path '*/caches/*' \
-             -name '*.go' \
-             -exec \
-      grep -nIHE \
-           -e "$empty_line" \
-           -e "$syntax_comment" \
-           -e "$syntax_comment_block" \
-           -e "$syntax_bracket" \
-           -e "$syntax_go_func" \
-           {} \; \
-      | cut_and_join \
-      >> "$adjustments_file" \
-      || echo ''
-  fi
-
-  if echo "$network" | grep -m1 '.dart$' 1>/dev/null;
-  then
-    # skip brackets
-    cd "$git_root" && \
-      find . -type f \
-             -name '*.dart' \
-             -exec \
-      grep -nIHE \
-           -e "$syntax_bracket" \
-           {} \; \
-      | cut_and_join \
-      >> "$adjustments_file" \
-      || echo ''
-  fi
-
-  if echo "$network" | grep -m1 '.php$' 1>/dev/null;
-  then
-    # skip empty lines, comments, and brackets
-    cd "$git_root" && \
-      find . -type f \
-             -not -path "*/vendor/*" \
-             -name '*.php' \
-             -exec \
-      grep -nIHE \
-           -e "$syntax_list" \
-           -e "$syntax_bracket" \
-           -e '^[[:space:]]*\);[[:space:]]*(//.*)?$' \
-           {} \; \
-      | cut_and_join \
-      >> "$adjustments_file" \
-      || echo ''
-  fi
-
-  if echo "$network" | grep -m1 '\(.cpp\|.h\|.cxx\|.c\|.hpp\|.m\|.swift\)$' 1>/dev/null;
-  then
-    # skip brackets
-    # shellcheck disable=SC2086,SC2090
-    cd "$git_root" && \
-      find . -type f \
-             $skip_dirs \
-         \( \
-           -name '*.h' \
-           -or -name '*.cpp' \
-           -or -name '*.cxx' \
-           -or -name '*.m' \
-           -or -name '*.c' \
-           -or -name '*.hpp' \
-           -or -name '*.swift' \
-         \) -exec \
-      grep -nIHE \
-           -e "$empty_line" \
-           -e "$syntax_bracket" \
-           -e '// LCOV_EXCL' \
-           {} \; \
-      | cut_and_join \
-      >> "$adjustments_file" \
-      || echo ''
-
-    # skip brackets
-    # shellcheck disable=SC2086,SC2090
-    cd "$git_root" && \
-      find . -type f \
-             $skip_dirs \
-         \( \
-           -name '*.h' \
-           -or -name '*.cpp' \
-           -or -name '*.cxx' \
-           -or -name '*.m' \
-           -or -name '*.c' \
-           -or -name '*.hpp' \
-           -or -name '*.swift' \
-         \) -exec \
-      grep -nIH '// LCOV_EXCL' \
-           {} \; \
-      >> "$adjustments_file" \
-      || echo ''
-
-  fi
-
-  found=$(< "$adjustments_file" tr -d ' ')
-
-  if [ "$found" != "" ];
-  then
-    say "    ${g}+${x} Found adjustments"
-    {
-      echo "# path=fixes";
-      cat "$adjustments_file";
-      echo "<<<<<< EOF";
-    } >> "$upload_file"
-    rm -rf "$adjustments_file"
-  else
-    say "    ${e}->${x} No adjustments found"
-  fi
-fi
-
-if [ "$url_o" != "" ];
-then
-  url="$url_o"
-fi
-
-if [ "$dump" != "0" ];
-then
-  # trim whitespace from query
-  say "    ${e}->${x} Dumping upload file (no upload)"
-  echo "$url/upload/v4?$(echo "package=bash-$VERSION&token=$token&$query" | tr -d ' ')"
-  cat "$upload_file"
-else
-  if [ "$save_to" != "" ];
-  then
-    say "${e}==>${x} Copying upload file to ${save_to}"
-    cp "$upload_file" "$save_to"
-  fi
-
-  say "${e}==>${x} Gzipping contents"
-  gzip -nf9 "$upload_file"
-
-  query=$(echo "${query}" | tr -d ' ')
-  say "${e}==>${x} Uploading reports"
-  say "    ${e}url:${x} $url"
-  say "    ${e}query:${x} $query"
-
-  # Full query without token (to display on terminal output)
-  queryNoToken=$(echo "package=bash-$VERSION&token=secret&$query" | tr -d ' ')
-  # now add token to query
-  query=$(echo "package=bash-$VERSION&token=$token&$query" | tr -d ' ')
-
-  if [ "$ft_s3" = "1" ];
-  then
-    say "${e}->${x}  Pinging Codecov"
-    say "$url/upload/v4?$queryNoToken"
-    # shellcheck disable=SC2086,2090
-    res=$(curl $curl_s -X POST $curlargs $cacert \
-          --retry 5 --retry-delay 2 --connect-timeout 2 \
-          -H 'X-Reduced-Redundancy: false' \
-          -H 'X-Content-Type: application/x-gzip' \
-          "$url/upload/v4?$query" || true)
-    # a good reply is "https://codecov.io" + "\n" + "https://storage.googleapis.com/codecov/..."
-    status=$(echo "$res" | head -1 | grep 'HTTP ' | cut -d' ' -f2)
-    if [ "$status" = "" ] && [ "$res" != "" ];
-    then
-      s3target=$(echo "$res" | sed -n 2p)
-      say "${e}->${x}  Uploading to"
-      say "${s3target}"
-
-      # shellcheck disable=SC2086
-      s3=$(curl -fiX PUT $curlawsargs \
-          --data-binary @"$upload_file.gz" \
-          -H 'Content-Type: application/x-gzip' \
-          -H 'Content-Encoding: gzip' \
-          "$s3target" || true)
-
-      if [ "$s3" != "" ];
-      then
-        say "    ${g}->${x} View reports at ${b}$(echo "$res" | sed -n 1p)${x}"
-        exit 0
-      else
-        say "    ${r}X>${x} Failed to upload"
-      fi
-    elif [ "$status" = "400" ];
-    then
-        # 400 Error
-        say "${g}${res}${x}"
-        exit ${exit_with}
-    fi
-  fi
-
-  say "${e}==>${x} Uploading to Codecov"
-
-  # shellcheck disable=SC2086,2090
-  res=$(curl -X POST $curlargs $cacert \
-        --data-binary @"$upload_file.gz" \
-        --retry 5 --retry-delay 2 --connect-timeout 2 \
-        -H 'Content-Type: text/plain' \
-        -H 'Content-Encoding: gzip' \
-        -H 'X-Content-Encoding: gzip' \
-        -H 'Accept: text/plain' \
-        "$url/upload/v2?$query&attempt=$i" || echo 'HTTP 500')
-  # HTTP 200
-  # http://....
-  status=$(echo "$res" | head -1 | cut -d' ' -f2)
-  if [ "$status" = "" ] || [ "$status" = "200" ];
-  then
-    say "    View reports at ${b}$(echo "$res" | head -2 | tail -1)${x}"
-    exit 0
-  else
-    say "    ${g}${res}${x}"
-    exit ${exit_with}
-  fi
-
-  say "    ${r}X> Failed to upload coverage reports${x}"
-fi
-
-exit ${exit_with}

From bc159b3ff77196919107be95a42d8580c5fe13b5 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 11:59:30 -0600
Subject: [PATCH 070/118] wip

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e39dc9b0d126..00d8065a7f62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,17 +30,17 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: run
-        args: --bin cargo-make --target-dir target/ci -- make ci-flow  --all-features
+        args: --bin cargo-make --target-dir target/ci -- make ci-flow
     - name: Run CI (Allow Failures)
       if: matrix.rust == 'nightly'
       continue-on-error: true
       uses: actions-rs/cargo@v1
       with:
         command: run
-        args: --bin cargo-make --target-dir target/ci -- make ci-flow  --all-features
+        args: --bin cargo-make --target-dir target/ci -- make ci-flow
     - name: Run CI (Minimal Supported Rust Version)
       if: matrix.rust != 'stable' && matrix.rust != 'beta' && matrix.rust != 'nightly'
       uses: actions-rs/cargo@v1
       with:
         command: make
-        args: ci-flow --all-features
\ No newline at end of file
+        args: ci-flow
\ No newline at end of file

From 66daf60179cd7219cc1cadffd1793a30234bdf62 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:12:00 -0600
Subject: [PATCH 071/118] wip

---
 .github/workflows/ci-rust.yml |  2 +-
 .github/workflows/ci.yml      |  6 ++++++
 Makefile.toml                 | 25 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Makefile.toml

diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
index 133e981321c3..c090bbddccba 100644
--- a/.github/workflows/ci-rust.yml
+++ b/.github/workflows/ci-rust.yml
@@ -48,7 +48,7 @@ jobs:
         run: sudo apt update
       - name: Install apt packages
         run: |
-            sudo apt install -y ocl-icd-opencl-dev make g++-5 clang-7 libgoogle-perftools-dev pkg-config libssl-dev
+            sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
             sudo apt-get install -y libhwloc-dev llvm 
         env:
           GCC_CXX: 'g++-5'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00d8065a7f62..826c698a8b98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Update apt repositories
+    run: sudo apt update
+    - name: Install apt packages
+    run: |
+        sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
+        sudo apt-get install -y libhwloc-dev llvm 
     - name: Install rust
       uses: actions-rs/toolchain@v1
       with:
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 000000000000..7890d8ff7584
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,25 @@
+[tasks.format]
+install_crate = "rustfmt"
+command = "cargo"
+args = ["fmt", "--", "--emit=files"]
+
+[tasks.clean]
+command = "cargo"
+args = ["clean"]
+
+[tasks.build]
+command = "cargo"
+args = ["build"]
+dependencies = ["clean"]
+
+[tasks.test]
+command = "cargo"
+args = ["test"]
+dependencies = ["clean"]
+
+[tasks.my-flow]
+dependencies = [
+    "format",
+    "build",
+    "test"
+]
\ No newline at end of file

From 461629e73c63b36f7008f7b9eeeda1eb6673cd51 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:14:27 -0600
Subject: [PATCH 072/118] wip

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 826c698a8b98..696208ffd5c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,11 +15,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Update apt repositories
-    run: sudo apt update
+      run: sudo apt update
     - name: Install apt packages
-    run: |
-        sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
-        sudo apt-get install -y libhwloc-dev llvm 
+      run: |
+          sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
+          sudo apt-get install -y libhwloc-dev llvm 
     - name: Install rust
       uses: actions-rs/toolchain@v1
       with:

From a2e1244dee23f209970bd0b56121551f7b464a9f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:17:27 -0600
Subject: [PATCH 073/118] wip

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 696208ffd5c4..40765701d190 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Update apt repositories
+      if: matrix.os == 'ubuntu-latest'
       run: sudo apt update
     - name: Install apt packages
+      if: matrix.os == 'ubuntu-latest'
       run: |
           sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
           sudo apt-get install -y libhwloc-dev llvm 

From 8e1aea26a947438ffaa5f3c9030bf2045362fca5 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:23:17 -0600
Subject: [PATCH 074/118] wip

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40765701d190..1526f5114e6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,15 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         rust: [stable, beta, nightly, 1.47.0]
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Update apt repositories
-      if: matrix.os == 'ubuntu-latest'
       run: sudo apt update
     - name: Install apt packages
-      if: matrix.os == 'ubuntu-latest'
       run: |
           sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
           sudo apt-get install -y libhwloc-dev llvm 

From 6e940681b28c51d095a031ac9f067a838ef63927 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:33:25 -0600
Subject: [PATCH 075/118] wip

---
 .github/workflows/ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1526f5114e6a..f0e8160a6308 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,10 +27,7 @@ jobs:
         profile: minimal
         override: true
     - name: Install cargo-make
-      uses: actions-rs/cargo@v1
-      with:
-        command: install
-        args: --debug cargo-make
+      uses: davidB/rust-cargo-make@v1
     - name: Run CI
       if: matrix.rust == 'stable' || matrix.rust == 'beta'
       uses: actions-rs/cargo@v1

From 0c380b5417b2e4ab4bfec43ce69082481cc8f51f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sun, 1 Nov 2020 12:41:22 -0600
Subject: [PATCH 076/118] wip

---
 .github/workflows/ci.yml    |  4 ++--
 .github/workflows/grcov.yml | 40 ++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f0e8160a6308..d48fd8d44fa6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Install cargo-make
+      uses: davidB/rust-cargo-make@v1
     - name: Update apt repositories
       run: sudo apt update
     - name: Install apt packages
@@ -26,8 +28,6 @@ jobs:
         toolchain: ${{ matrix.rust }}
         profile: minimal
         override: true
-    - name: Install cargo-make
-      uses: davidB/rust-cargo-make@v1
     - name: Run CI
       if: matrix.rust == 'stable' || matrix.rust == 'beta'
       uses: actions-rs/cargo@v1
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index c2a0c963e861..de9d3209a8a9 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -14,30 +14,30 @@ jobs:
         runs-on: ubuntu-latest
         steps:
         - name: Checkout repo
-            uses: actions/checkout@v2
-          - name: Update apt repositories
-            run: apt update -y
+          uses: actions/checkout@v2
+        - name: Update apt repositories
+          run: apt update -y
         - name: Install apt packages
-            run: |
-                apt install -y ocl-icd-opencl-dev
-                apt-get install -y libhwloc-dev
+          run: |
+              apt install -y ocl-icd-opencl-dev
+              apt-get install -y libhwloc-dev
         - name: Install latest nightly
           uses: actions-rs/toolchain@v1
           with:
             toolchain: nightly
             override: true
             components: rustfmt, clippy
-          - uses: actions-rs/cargo@v1
-            with:
-              command: test
-              args: --all-features --no-fail-fast
-            env:
-              CARGO_INCREMENTAL: '0'
-              RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-              RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          - uses: actions-rs/grcov@v0.1
-          - name: Coveralls upload
-            uses: coverallsapp/github-action@master
-            with:
-                github-token: ${{ secrets.GITHUB_TOKEN }}
-                path-to-lcov: ${{ steps.coverage.outputs.report }}
\ No newline at end of file
+          uses: actions-rs/cargo@v1
+          with:
+            command: test
+            args: --all-features --no-fail-fast
+          env:
+            CARGO_INCREMENTAL: '0'
+            RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+            RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
+          uses: actions-rs/grcov@v0.1
+        - name: Coveralls upload
+          uses: coverallsapp/github-action@master
+          with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            path-to-lcov: ${{ steps.coverage.outputs.report }}
\ No newline at end of file

From 58243ece5cde9295d4d28075ee6cf3b6b7e33d9a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:33:12 -0600
Subject: [PATCH 077/118] wip

---
 .github/workflows/ci.yml    | 49 -------------------------------------
 .github/workflows/grcov.yml | 43 --------------------------------
 2 files changed, 92 deletions(-)
 delete mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/grcov.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index d48fd8d44fa6..000000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: CI
-on: [pull_request]
-env:
-  CLICOLOR_FORCE: 1
-jobs:
-  ci:
-    name: CI
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        rust: [stable, beta, nightly, 1.47.0]
-        os: [ubuntu-latest]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Install cargo-make
-      uses: davidB/rust-cargo-make@v1
-    - name: Update apt repositories
-      run: sudo apt update
-    - name: Install apt packages
-      run: |
-          sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
-          sudo apt-get install -y libhwloc-dev llvm 
-    - name: Install rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        profile: minimal
-        override: true
-    - name: Run CI
-      if: matrix.rust == 'stable' || matrix.rust == 'beta'
-      uses: actions-rs/cargo@v1
-      with:
-        command: run
-        args: --bin cargo-make --target-dir target/ci -- make ci-flow
-    - name: Run CI (Allow Failures)
-      if: matrix.rust == 'nightly'
-      continue-on-error: true
-      uses: actions-rs/cargo@v1
-      with:
-        command: run
-        args: --bin cargo-make --target-dir target/ci -- make ci-flow
-    - name: Run CI (Minimal Supported Rust Version)
-      if: matrix.rust != 'stable' && matrix.rust != 'beta' && matrix.rust != 'nightly'
-      uses: actions-rs/cargo@v1
-      with:
-        command: make
-        args: ci-flow
\ No newline at end of file
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
deleted file mode 100644
index de9d3209a8a9..000000000000
--- a/.github/workflows/grcov.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-on:
-    push:
-      branches:
-        - master
-    pull_request:
-      branches:
-        - master
-
-name: Code coverage with grcov
-
-jobs:
-    lint:
-        runs-on: ubuntu-latest
-        steps:
-        - name: Checkout repo
-          uses: actions/checkout@v2
-        - name: Update apt repositories
-          run: apt update -y
-        - name: Install apt packages
-          run: |
-              apt install -y ocl-icd-opencl-dev
-              apt-get install -y libhwloc-dev
-        - name: Install latest nightly
-          uses: actions-rs/toolchain@v1
-          with:
-            toolchain: nightly
-            override: true
-            components: rustfmt, clippy
-          uses: actions-rs/cargo@v1
-          with:
-            command: test
-            args: --all-features --no-fail-fast
-          env:
-            CARGO_INCREMENTAL: '0'
-            RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-            RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          uses: actions-rs/grcov@v0.1
-        - name: Coveralls upload
-          uses: coverallsapp/github-action@master
-          with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-            path-to-lcov: ${{ steps.coverage.outputs.report }}
\ No newline at end of file

From 239a7045fb84443b072e85a3fbe1c996ab67703f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:39:54 -0600
Subject: [PATCH 078/118] wip

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bce1b55fd492..835fd297b850 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,9 +180,9 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-      - add_ssh_keys:
-          fingerprints:
-            - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
+      # - add_ssh_keys:
+      #     fingerprints:
+      #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
           command: bash ./scripts/build-rust-docs.sh

From 174d70b6835a5cc3ff7c0d5344d455b147bc8a2d Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:48:22 -0600
Subject: [PATCH 079/118] wip

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 835fd297b850..35a2670750a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,6 +180,7 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
+          
       # - add_ssh_keys:
       #     fingerprints:
       #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"

From ebacbd7b89028f4b1c37ed5deddf424dfb247aee Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:51:40 -0600
Subject: [PATCH 080/118] wip

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35a2670750a6..835fd297b850 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,7 +180,6 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-          
       # - add_ssh_keys:
       #     fingerprints:
       #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"

From 579a131e2b5ce79d8d58470547a3e13575404797 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:55:49 -0600
Subject: [PATCH 081/118] wip

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 835fd297b850..35a2670750a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,6 +180,7 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
+          
       # - add_ssh_keys:
       #     fingerprints:
       #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"

From 017c01421e65b4da488ed82b1f0ee6139c6202f4 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 11:59:26 -0600
Subject: [PATCH 082/118] wip

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35a2670750a6..835fd297b850 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,7 +180,6 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-          
       # - add_ssh_keys:
       #     fingerprints:
       #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"

From 34c2da7c2c2af489118ef46b70bb5e94c677311a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 12:01:32 -0600
Subject: [PATCH 083/118] wip

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 835fd297b850..bce1b55fd492 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,9 +180,9 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-      # - add_ssh_keys:
-      #     fingerprints:
-      #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
+      - add_ssh_keys:
+          fingerprints:
+            - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
           command: bash ./scripts/build-rust-docs.sh

From 213cf39a6225245c27aa210d02c5e21db45e68bc Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 12:35:11 -0600
Subject: [PATCH 084/118] wip

---
 .circleci/config.yml       | 43 +++++++++++++++++++++++++++-----------
 scripts/build-rust-docs.sh |  2 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bce1b55fd492..fde09b44525a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,22 +106,41 @@ commands:
       - env_setup
       - install_deps
 jobs:
-  cov:
+  # cov:
+  #   machine: true
+  #   steps:
+  #     - checkout
+  #     - run:
+  #         name: Pull xd009642/tarpaulin
+  #         command: docker pull xd009642/tarpaulin:latest
+  #     - run:
+  #         name: Generate report
+  #         command: >
+  #           docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
+  #           -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
+  #           --out Xml --all-features
+  #     - run:
+  #         name: Upload
+  #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
+  coverage:
     machine: true
+    description: Run code coverage
     steps:
-      - checkout
+      - build_setup
+      - restore_cargo_package_cache
       - run:
-          name: Pull xd009642/tarpaulin
-          command: docker pull xd009642/tarpaulin:latest
+        name: Setup code coverage output
+        command: |
+          echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
       - run:
-          name: Generate report
-          command: >
-            docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
-            --out Xml --all-features
+          name: Run code coverage
+          command: |
+            cargo xtest --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+          no_output_timeout: 20m
       - run:
-          name: Upload
-          command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
+          name: Upload result to codecov.io
+          command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
+      
   prefetch-crates:
     executor: test-executor
     description: Prefetch cargo crates for subsequent jobs.
@@ -202,7 +221,7 @@ workflows:
             - prefetch-crates
   coverage:
     jobs:
-      - cov
+      - coverage
       # - build-nightly:
       #     requires:
       #         - prefetch-crates/**/*.js
diff --git a/scripts/build-rust-docs.sh b/scripts/build-rust-docs.sh
index e6f4c54ba331..e94ce99b87c6 100644
--- a/scripts/build-rust-docs.sh
+++ b/scripts/build-rust-docs.sh
@@ -5,6 +5,6 @@ git init
 echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/forest/forest_vm/index.html">' > index.html
 git add .
 git config --global -l
-git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+git -c user.name='dutterbutter' -c user.email='ci' commit -m 'Deploy documentation'
 echo "${GITHUB_TOKEN}"
 git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
\ No newline at end of file

From c85526f5a4a97d323a1d7e2360cba6210b86fe64 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 12:46:16 -0600
Subject: [PATCH 085/118] wip

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fde09b44525a..721c44e59b9f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,15 +123,15 @@ jobs:
   #         name: Upload
   #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   coverage:
-    machine: true
+    executor: test-executor
     description: Run code coverage
     steps:
       - build_setup
       - restore_cargo_package_cache
       - run:
-        name: Setup code coverage output
-        command: |
-          echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+          name: Setup code coverage output
+          command: |
+            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
       - run:
           name: Run code coverage
           command: |

From f5bbdce75fe00d4e37391fbd3b77fbbbeae82884 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Mon, 2 Nov 2020 12:49:22 -0600
Subject: [PATCH 086/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 721c44e59b9f..9e659f91f9f0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,7 +135,7 @@ jobs:
       - run:
           name: Run code coverage
           command: |
-            cargo xtest --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+            cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
           no_output_timeout: 20m
       - run:
           name: Upload result to codecov.io

From d0f6a4d70c178eabfc17c425175ac37cd2259bc8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 13:29:09 -0600
Subject: [PATCH 087/118] wip

---
 .circleci/config.yml       | 58 ++++++++++++++++++++++++++++++--------
 scripts/build-rust-docs.sh |  5 ++--
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e659f91f9f0..45624a4ed117 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -122,25 +122,61 @@ jobs:
   #     - run:
   #         name: Upload
   #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
+  # coverage:
+  #   executor: test-executor
+  #   description: Run code coverage
+  #   steps:
+  #     - build_setup
+  #     - restore_cargo_package_cache
+  #     - run:
+  #         name: Setup code coverage output
+  #         command: |
+  #           echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+  #     - run:
+  #         name: Run code coverage
+  #         command: |
+  #           cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+  #         no_output_timeout: 20m
+  #     - run:
+  #         name: Upload result to codecov.io
+  #         command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   coverage:
     executor: test-executor
-    description: Run code coverage
+    description: Run Rust tests
+    environment:
+      GRCOVFLAGS: -s . --llvm --branch --ignore-not-existing --ignore "/*"
     steps:
       - build_setup
       - restore_cargo_package_cache
       - run:
-          name: Setup code coverage output
-          command: |
-            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+          name: Build tests with coverage
+          command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features
       - run:
-          name: Run code coverage
-          command: |
-            cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
-          no_output_timeout: 20m
+        name: Run tests
+        command: |
+          # TODO: Store test results in json `--format json`
+          # TODO: Fix coverage on zkp-macros-lib
+          # TODO: Enable --nocapture
+          CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace --exclude zkp-macros-lib
+          cargo +$NIGHTLY t --package zkp-macros-lib
+    - run:
+        name: Combine coverage
+        command: |
+          zip -0 target/ccov.zip `find . \( -name "*.gc*" \) -print`
+          grcov target/ccov.zip $GRCOVFLAGS -t lcov -o target/lcov.info
+    - run:
+        name: Submit to codecov
+        command: |
+          bash <(curl -s https://codecov.io/bash)
+  test-vectors:
+    executor: test-executor
+    description: Run serialization and conformance tests
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
       - run:
-          name: Upload result to codecov.io
-          command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
-      
+          name: Run test vectors
+          command: make run-vectors
   prefetch-crates:
     executor: test-executor
     description: Prefetch cargo crates for subsequent jobs.
diff --git a/scripts/build-rust-docs.sh b/scripts/build-rust-docs.sh
index e94ce99b87c6..ab9f9b3b616a 100644
--- a/scripts/build-rust-docs.sh
+++ b/scripts/build-rust-docs.sh
@@ -5,6 +5,5 @@ git init
 echo '<meta http-equiv="refresh" content="0; url=https://dutterbutter.github.io/forest/forest_vm/index.html">' > index.html
 git add .
 git config --global -l
-git -c user.name='dutterbutter' -c user.email='ci' commit -m 'Deploy documentation'
-echo "${GITHUB_TOKEN}"
-git push -f -q https://git:${GITHUB_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
\ No newline at end of file
+git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
+git push -f -q https://git:${GIT_TOKEN}@github.com/dutterbutter/forest HEAD:gh-pages
\ No newline at end of file

From 4aecc152e9573965cbf39573f53b1fde2977363a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 13:31:48 -0600
Subject: [PATCH 088/118] wip

---
 .circleci/config.yml | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 45624a4ed117..d03752a41f8c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -152,31 +152,31 @@ jobs:
           name: Build tests with coverage
           command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features
       - run:
-        name: Run tests
-        command: |
-          # TODO: Store test results in json `--format json`
-          # TODO: Fix coverage on zkp-macros-lib
-          # TODO: Enable --nocapture
-          CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace --exclude zkp-macros-lib
-          cargo +$NIGHTLY t --package zkp-macros-lib
-    - run:
-        name: Combine coverage
-        command: |
-          zip -0 target/ccov.zip `find . \( -name "*.gc*" \) -print`
-          grcov target/ccov.zip $GRCOVFLAGS -t lcov -o target/lcov.info
-    - run:
-        name: Submit to codecov
-        command: |
-          bash <(curl -s https://codecov.io/bash)
-  test-vectors:
-    executor: test-executor
-    description: Run serialization and conformance tests
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
+          name: Run tests
+          command: |
+            # TODO: Store test results in json `--format json`
+            # TODO: Fix coverage on zkp-macros-lib
+            # TODO: Enable --nocapture
+            CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace --exclude zkp-macros-lib
+            cargo +$NIGHTLY t --package zkp-macros-lib
       - run:
-          name: Run test vectors
-          command: make run-vectors
+          name: Combine coverage
+          command: |
+            zip -0 target/ccov.zip `find . \( -name "*.gc*" \) -print`
+            grcov target/ccov.zip $GRCOVFLAGS -t lcov -o target/lcov.info
+      - run:
+          name: Submit to codecov
+          command: |
+            bash <(curl -s https://codecov.io/bash)
+  # test-vectors:
+  #   executor: test-executor
+  #   description: Run serialization and conformance tests
+  #   steps:
+  #     - build_setup
+  #     - restore_cargo_package_cache
+  #     - run:
+  #         name: Run test vectors
+  #         command: make run-vectors
   prefetch-crates:
     executor: test-executor
     description: Prefetch cargo crates for subsequent jobs.

From 8e4848775cff613a5fcdd9a03cab2bd927778a89 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 14:06:48 -0600
Subject: [PATCH 089/118] wip

---
 .circleci/config.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d03752a41f8c..c14d13bc9147 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,11 +47,6 @@ commands:
             echo 'export CARGO_INCREMENTAL=0' >> $BASH_ENV
             echo 'export CI_TIMEOUT="timeout 40m"' >> $BASH_ENV
             echo 'export CC=gcc' >> $BASH_ENV
-            export RUST_NIGHTLY=$(cat cargo-toolchain)
-            echo 'export RUST_NIGHTLY='"$RUST_NIGHTLY" >> $BASH_ENV
-            export CARGO_INCREMENTAL=0
-            export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
-            export RUSTDOCFLAGS="-Cpanic=abort"
   install_deps:
     steps:
       - run:
@@ -157,8 +152,8 @@ jobs:
             # TODO: Store test results in json `--format json`
             # TODO: Fix coverage on zkp-macros-lib
             # TODO: Enable --nocapture
-            CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace --exclude zkp-macros-lib
-            cargo +$NIGHTLY t --package zkp-macros-lib
+            CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace
+            cargo +$NIGHTLY t --package
       - run:
           name: Combine coverage
           command: |

From 4d8cf2712565d4bc98d3b72717f4ce9f84104f58 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 14:38:38 -0600
Subject: [PATCH 090/118] wip

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c14d13bc9147..74d0e0e1c072 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ commands:
           command: |
             curl -O https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && \
             chmod +x rustup-init && \
-            ./rustup-init -y --no-modify-path --default-toolchain stable && \
+            ./rustup-init -y --no-modify-path --default-toolchain nightly && \
             rm rustup-init && \
             echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV && \
             source $BASH_ENV
@@ -28,8 +28,8 @@ commands:
       - run:
           name: Set rustc version
           command: |
-            rustup default stable
-            rustup update stable
+            rustup default nightly
+            rustup update nightly
   print_versions:
     description: Version Info
     steps:
@@ -230,9 +230,9 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-      - add_ssh_keys:
-          fingerprints:
-            - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
+      # - add_ssh_keys:
+      #     fingerprints:
+      #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
           command: bash ./scripts/build-rust-docs.sh

From a3ef28ac3e57eac223c12cb5ff987cb67613078a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 14:56:35 -0600
Subject: [PATCH 091/118] wip

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74d0e0e1c072..3790bf5d77e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ commands:
           command: |
             curl -O https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && \
             chmod +x rustup-init && \
-            ./rustup-init -y --no-modify-path --default-toolchain nightly && \
+            ./rustup-init -y --no-modify-path --default-toolchain stable && \
             rm rustup-init && \
             echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV && \
             source $BASH_ENV
@@ -28,8 +28,8 @@ commands:
       - run:
           name: Set rustc version
           command: |
-            rustup default nightly
-            rustup update nightly
+            rustup default stable
+            rustup update stable
   print_versions:
     description: Version Info
     steps:
@@ -153,7 +153,7 @@ jobs:
             # TODO: Fix coverage on zkp-macros-lib
             # TODO: Enable --nocapture
             CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace
-            cargo +$NIGHTLY t --package
+            rustup run nightly cargo +$NIGHTLY t --package
       - run:
           name: Combine coverage
           command: |

From 091d9672564696e3969182e4bb2fd3d026492523 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:19:46 -0600
Subject: [PATCH 092/118] wip

---
 .circleci/config.yml          | 139 ++++++++++------------
 .github/workflows/audit.yml   |  14 ---
 .github/workflows/ci-rust.yml | 211 ----------------------------------
 3 files changed, 60 insertions(+), 304 deletions(-)
 delete mode 100644 .github/workflows/audit.yml
 delete mode 100644 .github/workflows/ci-rust.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3790bf5d77e4..071c45c98a34 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,6 @@ executors:
     machine:
       image: ubuntu-1604:202004-01
     resource_class: xlarge
-  
 
 commands:
   install_rust:
@@ -101,6 +100,58 @@ commands:
       - env_setup
       - install_deps
 jobs:
+  prefetch-crates:
+    executor: test-executor
+    description: Prefetch cargo crates for subsequent jobs.
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Fetch workspace dependencies over network
+          command: cargo fetch
+      - save_cargo_package_cache
+  nightly-build-check:
+    executor: test-executor
+    description: Check nightly build
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Nightly Build
+          command: |
+            rustup run nightly rustc --version --verbose
+            rustup run nightly cargo --version --verbose
+            rustup run nightly cargo build
+  lint:
+    executor: test-executor
+    description: Run Rust linting tools.
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: cargo clippy
+          command: cargo clippy -- -D warnings
+      - run:
+          name: cargo fmt
+          command: cargo fmt --all -- --check
+  test:
+    executor: test-executor
+    description: Run Rust tests
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Run Unit Tests
+          command: make test
+  test-vectors:
+    executor: test-executor
+    description: Run serialization and conformance tests
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Run test vectors
+          command: make run-vectors
   # cov:
   #   machine: true
   #   steps:
@@ -117,24 +168,6 @@ jobs:
   #     - run:
   #         name: Upload
   #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
-  # coverage:
-  #   executor: test-executor
-  #   description: Run code coverage
-  #   steps:
-  #     - build_setup
-  #     - restore_cargo_package_cache
-  #     - run:
-  #         name: Setup code coverage output
-  #         command: |
-  #           echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
-  #     - run:
-  #         name: Run code coverage
-  #         command: |
-  #           cargo test --all-features --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
-  #         no_output_timeout: 20m
-  #     - run:
-  #         name: Upload result to codecov.io
-  #         command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   coverage:
     executor: test-executor
     description: Run Rust tests
@@ -163,55 +196,6 @@ jobs:
           name: Submit to codecov
           command: |
             bash <(curl -s https://codecov.io/bash)
-  # test-vectors:
-  #   executor: test-executor
-  #   description: Run serialization and conformance tests
-  #   steps:
-  #     - build_setup
-  #     - restore_cargo_package_cache
-  #     - run:
-  #         name: Run test vectors
-  #         command: make run-vectors
-  prefetch-crates:
-    executor: test-executor
-    description: Prefetch cargo crates for subsequent jobs.
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
-      - run:
-          name: Fetch workspace dependencies over network
-          command: cargo fetch
-      - save_cargo_package_cache
-  lint:
-    executor: test-executor
-    description: Run Rust linting tools.
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
-      - run:
-          name: cargo clippy
-          command: cargo clippy -- -D warnings
-      - run:
-          name: cargo fmt
-          command: cargo fmt --all -- --check
-  test:
-    executor: test-executor
-    description: Run Rust tests
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
-      - run:
-          name: Run Unit Tests
-          command: make test
-  test-vectors:
-    executor: test-executor
-    description: Run serialization and conformance tests
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
-      - run:
-          name: Run test vectors
-          command: make run-vectors
   install:
     executor: test-executor
     description: Install forest binary
@@ -219,7 +203,7 @@ jobs:
       - build_setup
       - restore_cargo_package_cache
       - run:
-          name: Build Unit Tests
+          name: Install binary
           command: make install
   publish-docs:
     executor: test-executor
@@ -230,9 +214,6 @@ jobs:
       - run:
           name: Build Docs
           command: cargo doc --no-deps --all-features
-      # - add_ssh_keys:
-      #     fingerprints:
-      #       - "68:80:3e:38:03:0e:2c:96:ef:6d:ef:13:01:af:18:bd"
       - run:
           name: Publish Docs
           command: bash ./scripts/build-rust-docs.sh
@@ -241,18 +222,18 @@ workflows:
   setup_test:
     jobs:
       - prefetch-crates
+      - lint:
+          requires:
+            - prefetch-crates
       - test:
           requires:
             - prefetch-crates
-  docs:
-    jobs:
-      - prefetch-crates
-      - publish-docs:
+      - test-vectors:
           requires:
             - prefetch-crates
+  docs:
+    jobs:
+      - publish-docs
   coverage:
     jobs:
       - coverage
-      # - build-nightly:
-      #     requires:
-      #         - prefetch-crates/**/*.js
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
deleted file mode 100644
index 2fdf7db48de9..000000000000
--- a/.github/workflows/audit.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Security audit
-on:
-  push:
-    paths: 
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
deleted file mode 100644
index c090bbddccba..000000000000
--- a/.github/workflows/ci-rust.yml
+++ /dev/null
@@ -1,211 +0,0 @@
-name: Rust CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  cov:
-    name: coverage
-    runs-on: ubuntu-latest
-    container:
-      image: xd009642/tarpaulin
-      options: --security-opt seccomp=unconfined
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Update apt repositories
-        run: apt update -y
-      - name: Install apt packages
-        run: |
-            apt install -y ocl-icd-opencl-dev
-            apt-get install -y libhwloc-dev
-      - name: Install latest nightly
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: nightly
-            override: true
-            components: rustfmt, clippy
-      - name: Generate code coverage
-        run: |
-          cargo +nightly tarpaulin --verbose -l --all-features --workspace --exclude-files tests/conformance_tests/src --timeout 120 --out Xml
-
-      - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1
-        with:
-          fail_ci_if_error: true
-  coverme:
-    name: COV-2
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-      - name: Update apt repositories
-        run: sudo apt update
-      - name: Install apt packages
-        run: |
-            sudo apt install -y ocl-icd-opencl-dev make clang pkg-config libssl-dev
-            sudo apt-get install -y libhwloc-dev llvm 
-        env:
-          GCC_CXX: 'g++-5'
-          GCOV: 'gcov-5'
-          CLANG_CXX: 'clang++-7'
-          DEPLOY: '0'
-      - name: Install latest nightly
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-          components: rustfmt, clippy
-
-      - name: Pull submodules
-        run: git submodule update --init
-
-      - name: Run all unit tests
-        run: make test
-        env:
-          CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Cpanic=abort'
-
-      - uses: actions-rs/grcov@v0.1
-      - name: Coveralls upload
-        uses: coverallsapp/github-action@master
-        with:
-            github-token: ${{ secrets.GIT_TOKEN }}
-            path-to-lcov: ${{ steps.coverage.outputs.report }}
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Update apt repositories
-        run: sudo apt update
-
-      - name: Install apt packages
-        run: |
-            sudo apt install ocl-icd-opencl-dev
-            sudo apt-get install -y libhwloc-dev
-
-      # TODO enable when protoc needed again
-      # - name: Install Protoc
-      #   uses: arduino/setup-protoc@master
-      #   with:
-      #     version: "3.9.1"
-
-      - name: Toolchain setup
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      
-      - name: Pull submodules
-        run: git submodule update --init
-
-      - name: Run all unit tests
-        run: make test
-
-      - name: Run test vectors
-        run: make run-vectors
-
-  fmt:
-    name: rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Toolchain setup
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - run: rustup component add rustfmt
-      - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: Check license headers
-        run: make license
-
-  clippy:
-    name: clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: "recursive"
-
-      - name: Update apt repositories
-        run: sudo apt update
-
-      - name: Install OpenCL
-        run: sudo apt install ocl-icd-opencl-dev
-
-      # - name: Install Protoc
-      #   uses: arduino/setup-protoc@master
-      #   with:
-      #     version: "3.9.1"
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add clippy
-
-      - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-
-      - name: Check forest binary
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: -p forest
-
-  # publish_docs:
-  #   if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
-  #   name: Publish Documentation
-  #   needs: [clippy, test]
-  #   runs-on: ubuntu-16.04
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #       with:
-  #         submodules: "recursive"
-
-  #     - name: Install Rust
-  #       run: rustup update beta && rustup default beta
-
-  #     - name: Update apt repositories
-  #       run: sudo apt update
-
-  #     - name: Install OpenCL
-  #       run: sudo apt install ocl-icd-opencl-dev
-
-  #     # - name: Install Protoc
-  #     #   uses: arduino/setup-protoc@master
-  #     #   with:
-  #     #     version: "3.9.1"
-
-  #     - name: Build documentation
-  #       run: cargo doc --no-deps --all-features
-  #     - name: Publish documentation
-  #       run: |
-  #         cd target/doc
-  #         git init
-  #         echo '<meta http-equiv="refresh" content="0; url=https://chainsafe.github.io/forest/forest_vm/index.html">' > index.html
-  #         git add .
-  #         git -c user.name='ci' -c user.email='ci' commit -m 'Deploy documentation'
-  #         git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages

From 5565074a6efa37c1f362f39735afe20d3a5079b1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:24:54 -0600
Subject: [PATCH 093/118] wip

---
 .circleci/config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 071c45c98a34..a3a006c84146 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,6 +231,12 @@ workflows:
       - test-vectors:
           requires:
             - prefetch-crates
+  build-check:
+    jobs:
+      - prefetch-crates
+      - nightly-build-check:
+          requires:
+            - prefetch-crates
   docs:
     jobs:
       - publish-docs

From 613b09083af07347df3616bc17dcb2948821bb7e Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:33:00 -0600
Subject: [PATCH 094/118] wip

---
 .circleci/config.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a3a006c84146..e8c80cc29064 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,10 +111,11 @@ jobs:
           command: cargo fetch
       - save_cargo_package_cache
   nightly-build-check:
-    executor: test-executor
+    docker:
+      - image: rust:latest
     description: Check nightly build
     steps:
-      - build_setup
+      - checkout
       - restore_cargo_package_cache
       - run:
           name: Nightly Build
@@ -169,13 +170,13 @@ jobs:
   #         name: Upload
   #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   coverage:
-    executor: test-executor
+    docker:
+      - image: rust:latest
     description: Run Rust tests
     environment:
       GRCOVFLAGS: -s . --llvm --branch --ignore-not-existing --ignore "/*"
     steps:
-      - build_setup
-      - restore_cargo_package_cache
+      - checkout
       - run:
           name: Build tests with coverage
           command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features

From f3ab495835dbaaee4ab09d2498b749fcc88375f1 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:35:58 -0600
Subject: [PATCH 095/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e8c80cc29064..5ae659fa4806 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,7 +116,6 @@ jobs:
     description: Check nightly build
     steps:
       - checkout
-      - restore_cargo_package_cache
       - run:
           name: Nightly Build
           command: |
@@ -177,6 +176,7 @@ jobs:
       GRCOVFLAGS: -s . --llvm --branch --ignore-not-existing --ignore "/*"
     steps:
       - checkout
+      - install_deps
       - run:
           name: Build tests with coverage
           command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features

From f720b96b23566684de92191a9f303e97c8540f3f Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:44:20 -0600
Subject: [PATCH 096/118] wip

---
 .circleci/config.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ae659fa4806..f9c9bbddcf85 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,6 +116,12 @@ jobs:
     description: Check nightly build
     steps:
       - checkout
+      - install_rust
+      - run:
+          name: Set rustc version
+          command: |
+            rustup default nightly
+            rustup update nightly
       - run:
           name: Nightly Build
           command: |
@@ -169,14 +175,19 @@ jobs:
   #         name: Upload
   #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   coverage:
-    docker:
-      - image: rust:latest
+    executor: test-executor
     description: Run Rust tests
     environment:
       GRCOVFLAGS: -s . --llvm --branch --ignore-not-existing --ignore "/*"
     steps:
       - checkout
+      - install_rust
       - install_deps
+      - run:
+          name: Set rustc version
+          command: |
+            rustup default nightly
+            rustup update nightly
       - run:
           name: Build tests with coverage
           command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features

From 4a9d302c3af809431dcaa095c289ad0e90761ea4 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 19:51:29 -0600
Subject: [PATCH 097/118] wip

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9c9bbddcf85..17f97225d2dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,6 +117,7 @@ jobs:
     steps:
       - checkout
       - install_rust
+      - install_deps
       - run:
           name: Set rustc version
           command: |
@@ -183,6 +184,7 @@ jobs:
       - checkout
       - install_rust
       - install_deps
+      - env_setup
       - run:
           name: Set rustc version
           command: |

From fafdffc7eac08ec185cb18a8cba47abda3596afe Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 20:01:33 -0600
Subject: [PATCH 098/118] wip

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 17f97225d2dc..6b4267e36678 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,13 +111,13 @@ jobs:
           command: cargo fetch
       - save_cargo_package_cache
   nightly-build-check:
-    docker:
-      - image: rust:latest
+    executor: test-executor
     description: Check nightly build
     steps:
       - checkout
       - install_rust
       - install_deps
+      - env_setup
       - run:
           name: Set rustc version
           command: |
@@ -192,7 +192,7 @@ jobs:
             rustup update nightly
       - run:
           name: Build tests with coverage
-          command: CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --no-run --all-features
+          command: RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY --verbose t --no-run --all-features
       - run:
           name: Run tests
           command: |

From 5f1c1e37b2bc8164f5aa3f80bcb330c03a268646 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 20:31:32 -0600
Subject: [PATCH 099/118] wip

---
 .circleci/config.yml                      | 78 ++++++++++-------------
 blockchain/chain/src/store/chain_store.rs |  2 +-
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b4267e36678..a7d89e53d1f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -129,6 +129,20 @@ jobs:
             rustup run nightly rustc --version --verbose
             rustup run nightly cargo --version --verbose
             rustup run nightly cargo build
+  macos-build-check:
+    macos:
+      xcode: 11.3.0
+    description: Check macos build
+    steps:
+      - checkout
+      - install_rust
+      - rust_setup
+      - env_setup
+      - run:
+          name: Macos build
+          command: |
+            cargo clean
+            cargo build
   lint:
     executor: test-executor
     description: Run Rust linting tools.
@@ -159,57 +173,28 @@ jobs:
       - run:
           name: Run test vectors
           command: make run-vectors
-  # cov:
-  #   machine: true
-  #   steps:
-  #     - checkout
-  #     - run:
-  #         name: Pull xd009642/tarpaulin
-  #         command: docker pull xd009642/tarpaulin:latest
-  #     - run:
-  #         name: Generate report
-  #         command: >
-  #           docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-  #           -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
-  #           --out Xml --all-features
-  #     - run:
-  #         name: Upload
-  #         command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   coverage:
-    executor: test-executor
-    description: Run Rust tests
-    environment:
-      GRCOVFLAGS: -s . --llvm --branch --ignore-not-existing --ignore "/*"
+    machine: true
     steps:
       - checkout
-      - install_rust
-      - install_deps
-      - env_setup
       - run:
-          name: Set rustc version
-          command: |
-            rustup default nightly
-            rustup update nightly
-      - run:
-          name: Build tests with coverage
-          command: RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY --verbose t --no-run --all-features
+          name: Pull xd009642/tarpaulin
+          command: docker pull xd009642/tarpaulin:latest
       - run:
-          name: Run tests
+          name: 
           command: |
-            # TODO: Store test results in json `--format json`
-            # TODO: Fix coverage on zkp-macros-lib
-            # TODO: Enable --nocapture
-            CARGO_INCREMENTAL=0 RUSTFLAGS="$COVFLAGS" cargo +$NIGHTLY t --workspace
-            rustup run nightly cargo +$NIGHTLY t --package
-      - run:
-          name: Combine coverage
-          command: |
-            zip -0 target/ccov.zip `find . \( -name "*.gc*" \) -print`
-            grcov target/ccov.zip $GRCOVFLAGS -t lcov -o target/lcov.info
-      - run:
-          name: Submit to codecov
-          command: |
-            bash <(curl -s https://codecov.io/bash)
+            cargo clean
+            cargo build
+            make test-all
+      - run:
+          name: Generate report
+          command: >
+            docker run --security-opt seccomp=unconfined -e
+            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
+            --out Xml --all-features
+      - run:
+          name: Upload
+          command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
   install:
     executor: test-executor
     description: Install forest binary
@@ -251,6 +236,9 @@ workflows:
       - nightly-build-check:
           requires:
             - prefetch-crates
+      - macos-build-check:
+          requires:
+            - prefetch-crates
   docs:
     jobs:
       - publish-docs
diff --git a/blockchain/chain/src/store/chain_store.rs b/blockchain/chain/src/store/chain_store.rs
index 172ead9ae506..9d4f78cbcc08 100644
--- a/blockchain/chain/src/store/chain_store.rs
+++ b/blockchain/chain/src/store/chain_store.rs
@@ -834,7 +834,7 @@ pub async fn sub_head_changes(
 #[cfg(feature = "json")]
 pub mod headchange_json {
     use super::*;
-    use blocks::{tipset::tipset_json::TipsetJsonRef, Tipset};
+    use blocks::{tipset::tipset_json::TipsetJsonRef};
     use serde::Serialize;
 
     #[derive(Serialize)]

From f8ab30acfa9aec7da25bca51d9337d3d46b28c41 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 20:42:47 -0600
Subject: [PATCH 100/118] wip

---
 .circleci/config.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7d89e53d1f5..b3d5cbbc1f5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,14 +135,23 @@ jobs:
     description: Check macos build
     steps:
       - checkout
-      - install_rust
+      - run:
+          name: Install rust toolchain          
+          command: |
+            curl https://sh.rustup.rs -sSf -o install_rust.sh
+            chmod +x install_rust.sh
+            ./install_rust.sh -q -y
+            rm install_rust.sh
+            export PATH="${HOME}/.cargo/bin:${PATH}"
+            rustc -V
       - rust_setup
       - env_setup
       - run:
           name: Macos build
           command: |
-            cargo clean
-            cargo build
+            rustup run stable rustc --version --verbose
+            rustup run stable cargo --version --verbose
+            rustup run stable cargo build
   lint:
     executor: test-executor
     description: Run Rust linting tools.
@@ -180,12 +189,6 @@ jobs:
       - run:
           name: Pull xd009642/tarpaulin
           command: docker pull xd009642/tarpaulin:latest
-      - run:
-          name: 
-          command: |
-            cargo clean
-            cargo build
-            make test-all
       - run:
           name: Generate report
           command: >

From 020ae7d01d9511fa008c4c3192e076fa5d9a8d76 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 20:45:08 -0600
Subject: [PATCH 101/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3d5cbbc1f5b..392c70892be6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -192,7 +192,7 @@ jobs:
       - run:
           name: Generate report
           command: >
-            docker run --security-opt seccomp=unconfined -e
+            docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
             -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
             --out Xml --all-features
       - run:

From ae5d29fd98403e7559df801a07e6c51b708c3834 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 21:04:01 -0600
Subject: [PATCH 102/118] wip

---
 .circleci/config.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 392c70892be6..d436612d5499 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -146,6 +146,10 @@ jobs:
             rustc -V
       - rust_setup
       - env_setup
+      - run: 
+          name: Install deps
+          command: |
+            brew install hwloc
       - run:
           name: Macos build
           command: |
@@ -198,6 +202,21 @@ jobs:
       - run:
           name: Upload
           command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
+  coverage_2:
+    executor: test-executor
+    description: Run GRCOV 
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Setup code coverage output
+          command: |
+            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+      - run:
+          name: Run code coverage
+          command: |
+            cargo run --package x --bin x -- test --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+          no_output_timeout: 20m
   install:
     executor: test-executor
     description: Install forest binary
@@ -248,3 +267,4 @@ workflows:
   coverage:
     jobs:
       - coverage
+      - coverage_2

From 605cd36fc2d48d1a81a9f5c9c783e1c621d6ad45 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 21:39:30 -0600
Subject: [PATCH 103/118] wip

---
 .circleci/config.yml | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d436612d5499..bc8e81ab74c9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,9 @@ executors:
       image: ubuntu-1604:202004-01
     resource_class: xlarge
 
+######################################################################################################################
+  #  Reusable single command definitions
+######################################################################################################################
 commands:
   install_rust:
     description: Install Rust Toolchain
@@ -99,6 +102,7 @@ commands:
       - print_versions
       - env_setup
       - install_deps
+
 jobs:
   prefetch-crates:
     executor: test-executor
@@ -110,6 +114,10 @@ jobs:
           name: Fetch workspace dependencies over network
           command: cargo fetch
       - save_cargo_package_cache
+
+######################################################################################################################
+  #  Build related jobs
+######################################################################################################################
   nightly-build-check:
     executor: test-executor
     description: Check nightly build
@@ -131,7 +139,7 @@ jobs:
             rustup run nightly cargo build
   macos-build-check:
     macos:
-      xcode: 11.3.0
+      xcode: 12.0.1
     description: Check macos build
     steps:
       - checkout
@@ -156,6 +164,19 @@ jobs:
             rustup run stable rustc --version --verbose
             rustup run stable cargo --version --verbose
             rustup run stable cargo build
+  install:
+    executor: test-executor
+    description: Install forest binary
+    steps:
+      - build_setup
+      - restore_cargo_package_cache
+      - run:
+          name: Install binary
+          command: make install
+
+######################################################################################################################
+  #  Testing, linting, code coverage and doc publishing
+######################################################################################################################
   lint:
     executor: test-executor
     description: Run Rust linting tools.
@@ -215,17 +236,11 @@ jobs:
       - run:
           name: Run code coverage
           command: |
-            cargo run --package x --bin x -- test --html-cov-dir=$CODECOV_OUTPUT/grcovhtml/ --html-lcov-dir=$CODECOV_OUTPUT/lcovhtml/ --no-fail-fast -j 10 || true
+            grcov . -o lcov.info -t bash <(curl -s https://codecov.io/bash)
           no_output_timeout: 20m
-  install:
-    executor: test-executor
-    description: Install forest binary
-    steps:
-      - build_setup
-      - restore_cargo_package_cache
-      - run:
-          name: Install binary
-          command: make install
+      # - run:
+      #     name: Upload result to codecov.io
+      #     command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   publish-docs:
     executor: test-executor
     description: Publish documentation to GitHub pages
@@ -261,6 +276,9 @@ workflows:
       - macos-build-check:
           requires:
             - prefetch-crates
+      - install:
+          requires:
+          - prefetch-crates
   docs:
     jobs:
       - publish-docs

From a2ca3d8fb75b5d2e7ebaecf1deb35359bd1ac8be Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 21:51:02 -0600
Subject: [PATCH 104/118] wip

---
 .circleci/config.yml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc8e81ab74c9..5b176990224e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,17 +227,33 @@ jobs:
     executor: test-executor
     description: Run GRCOV 
     steps:
-      - build_setup
+      - checkout
+      - install_rust
+      - install_deps
+      - env_setup
+      - run:
+          name: Set rustc version
+          command: |
+            rustup default nightly
+            rustup update nightly
       - restore_cargo_package_cache
       - run:
-          name: Setup code coverage output
+          name: Install grcov
+          command: |
+            curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf -
+      - run:
+          name: Run test suite
           command: |
-            echo "export CODECOV_OUTPUT=codecov" >> $BASH_ENV
+            export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+            export RUSTDOCFLAGS="-Cpanic=abort"
+            cargo build --verbose $CARGO_OPTIONS
+            cargo test --verbose $CARGO_OPTIONS
       - run:
-          name: Run code coverage
+          name: Upload to codecov
           command: |
-            grcov . -o lcov.info -t bash <(curl -s https://codecov.io/bash)
-          no_output_timeout: 20m
+            zip -0 ccov.zip `find . \( -name "forest*.gc*" \) -print`;
+            ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info;
+            bash <(curl -s https://codecov.io/bash) -f lcov.info;
       # - run:
       #     name: Upload result to codecov.io
       #     command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;

From ff32dd4ec3e564d6f1ad7087f02c6c224c9ce825 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 4 Nov 2020 22:19:40 -0600
Subject: [PATCH 105/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b176990224e..0bdda548c716 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ commands:
             sudo apt-get update
             sudo apt-get install -y clang  \
                 curl file gcc g++ git make openssh-client \
-                autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev \
+                autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
                 xz-utils pkg-config python clang ocl-icd-opencl-dev libgflags-dev libhwloc-dev
             rustup component add clippy rustfmt

From 509d78349bf31f6ea4b954370b443aca6cb6fe9a Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 09:38:29 -0600
Subject: [PATCH 106/118] wip

---
 .circleci/config.yml                      | 4 ++--
 blockchain/chain/src/store/chain_store.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0bdda548c716..3ad0b640dbf1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,11 +55,11 @@ commands:
           name: Install Dependencies
           command: |
             sudo apt-get update
-            sudo apt-get install -y clang  \
+            sudo apt-get install -y \
                 curl file gcc g++ git make openssh-client \
                 autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
-                xz-utils pkg-config python clang ocl-icd-opencl-dev libgflags-dev libhwloc-dev
+                xz-utils pkg-config python clang --coverage ocl-icd-opencl-dev libgflags-dev libhwloc-dev
             rustup component add clippy rustfmt
             git submodule update --init
 
diff --git a/blockchain/chain/src/store/chain_store.rs b/blockchain/chain/src/store/chain_store.rs
index 9d4f78cbcc08..7f6efd0e2c2d 100644
--- a/blockchain/chain/src/store/chain_store.rs
+++ b/blockchain/chain/src/store/chain_store.rs
@@ -834,7 +834,7 @@ pub async fn sub_head_changes(
 #[cfg(feature = "json")]
 pub mod headchange_json {
     use super::*;
-    use blocks::{tipset::tipset_json::TipsetJsonRef};
+    use blocks::tipset::tipset_json::TipsetJsonRef;
     use serde::Serialize;
 
     #[derive(Serialize)]

From 82e1d775a760d5941fd7bb85223a3ee71a451e8b Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 09:43:06 -0600
Subject: [PATCH 107/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ad0b640dbf1..1cb30435a08c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,7 @@ commands:
                 curl file gcc g++ git make openssh-client \
                 autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
-                xz-utils pkg-config python clang --coverage ocl-icd-opencl-dev libgflags-dev libhwloc-dev
+                xz-utils pkg-config python clang=6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
             rustup component add clippy rustfmt
             git submodule update --init
 

From 25bba412e5061683f55428a4577ad5c202a85eef Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 09:45:28 -0600
Subject: [PATCH 108/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1cb30435a08c..990b36095a12 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,7 @@ commands:
                 curl file gcc g++ git make openssh-client \
                 autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
-                xz-utils pkg-config python clang=6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
+                xz-utils pkg-config python clang++-6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
             rustup component add clippy rustfmt
             git submodule update --init
 

From c76d83cf1cb46c35d621bb24a6596f0c2a01a842 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 10:02:51 -0600
Subject: [PATCH 109/118] wip

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 990b36095a12..bc857522cc35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,8 @@ commands:
                 curl file gcc g++ git make openssh-client \
                 autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
-                xz-utils pkg-config python clang++-6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
+                xz-utils pkg-config python libclang-6.0-dev clang++-6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
+            sudo ln -s /usr/bin/clang-6.0 /usr/bin/clang
             rustup component add clippy rustfmt
             git submodule update --init
 

From c71164988f0b3f5c5129607fb8bc5eac02aa2451 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 10:31:58 -0600
Subject: [PATCH 110/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc857522cc35..31353a8b733d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -247,7 +247,7 @@ jobs:
           command: |
             export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
             export RUSTDOCFLAGS="-Cpanic=abort"
-            cargo build --verbose $CARGO_OPTIONS
+            RUST_BACKTRACE=1 cargo build --verbose $CARGO_OPTIONS
             cargo test --verbose $CARGO_OPTIONS
       - run:
           name: Upload to codecov

From 26aebcf12b1d1e4721734ae676d8315c587f6dc6 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 12:03:34 -0600
Subject: [PATCH 111/118] wip

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31353a8b733d..7bf8fc76530b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -245,10 +245,9 @@ jobs:
       - run:
           name: Run test suite
           command: |
-            export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
-            export RUSTDOCFLAGS="-Cpanic=abort"
+            export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Coverflow-checks=off"
             RUST_BACKTRACE=1 cargo build --verbose $CARGO_OPTIONS
-            cargo test --verbose $CARGO_OPTIONS
+            cargo test --all-features --verbose $CARGO_OPTIONS
       - run:
           name: Upload to codecov
           command: |

From e81ceebf9ffc6f735b7858d722b560d972883a70 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 5 Nov 2020 12:57:05 -0600
Subject: [PATCH 112/118] wip

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bf8fc76530b..dc510284188c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -247,7 +247,8 @@ jobs:
           command: |
             export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Coverflow-checks=off"
             RUST_BACKTRACE=1 cargo build --verbose $CARGO_OPTIONS
-            cargo test --all-features --verbose $CARGO_OPTIONS
+            RUST_BACKTRACE=1 make test-vectors
+            RUST_BACKTRACE=1 cargo test --all-features --verbose $CARGO_OPTIONS
       - run:
           name: Upload to codecov
           command: |

From 60d6a45e97c7d1d353cd828bb097e67e9169af61 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 15:08:49 -0600
Subject: [PATCH 113/118] wip

---
 .circleci/config.yml | 105 ++++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 37 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc510284188c..b2baa812e3a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,10 @@ executors:
     machine:
       image: ubuntu-1604:202004-01
     resource_class: xlarge
+  mac-executor:
+    macos:
+      xcode: 12.0.1
+    resource_class: xlarge
 
 ######################################################################################################################
   #  Reusable single command definitions
@@ -59,8 +63,7 @@ commands:
                 curl file gcc g++ git make openssh-client \
                 autoconf automake cmake libtool libcurl4-openssl-dev libssl-dev llvm\
                 libelf-dev libdw-dev binutils-dev zlib1g-dev libiberty-dev wget \
-                xz-utils pkg-config python libclang-6.0-dev clang++-6 ocl-icd-opencl-dev libgflags-dev libhwloc-dev
-            sudo ln -s /usr/bin/clang-6.0 /usr/bin/clang
+                xz-utils pkg-config python libclang-6.0-dev clang ocl-icd-opencl-dev libgflags-dev libhwloc-dev
             rustup component add clippy rustfmt
             git submodule update --init
 
@@ -119,6 +122,7 @@ jobs:
 ######################################################################################################################
   #  Build related jobs
 ######################################################################################################################
+  # TODO change builds over to matrix style once Windows build is ready
   nightly-build-check:
     executor: test-executor
     description: Check nightly build
@@ -139,8 +143,7 @@ jobs:
             rustup run nightly cargo --version --verbose
             rustup run nightly cargo build
   macos-build-check:
-    macos:
-      xcode: 12.0.1
+    executor: mac-executor
     description: Check macos build
     steps:
       - checkout
@@ -209,34 +212,30 @@ jobs:
           name: Run test vectors
           command: make run-vectors
   coverage:
-    machine: true
+    executor: mac-executor
+    description: Run coverage reporting using grcov
     steps:
       - checkout
       - run:
-          name: Pull xd009642/tarpaulin
-          command: docker pull xd009642/tarpaulin:latest
-      - run:
-          name: Generate report
-          command: >
-            docker run --security-opt seccomp=unconfined -e CODECOV_TOKEN=${CODECOV_TOKEN}
-            -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin -v --ciserver circle-ci
-            --out Xml --all-features
-      - run:
-          name: Upload
-          command: bash <(curl -s https://codecov.io/bash) -Z -f cobertura.xml
-  coverage_2:
-    executor: test-executor
-    description: Run GRCOV 
-    steps:
-      - checkout
-      - install_rust
-      - install_deps
+          name: Install rust toolchain          
+          command: |
+            curl https://sh.rustup.rs -sSf -o install_rust.sh
+            chmod +x install_rust.sh
+            ./install_rust.sh -q -y
+            rm install_rust.sh
+            export PATH="${HOME}/.cargo/bin:${PATH}"
+            rustc -V
       - env_setup
       - run:
           name: Set rustc version
           command: |
             rustup default nightly
             rustup update nightly
+      - run: 
+          name: Install deps
+          command: |
+            brew install hwloc
+            brew install git
       - restore_cargo_package_cache
       - run:
           name: Install grcov
@@ -246,30 +245,50 @@ jobs:
           name: Run test suite
           command: |
             export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Coverflow-checks=off"
-            RUST_BACKTRACE=1 cargo build --verbose $CARGO_OPTIONS
-            RUST_BACKTRACE=1 make test-vectors
-            RUST_BACKTRACE=1 cargo test --all-features --verbose $CARGO_OPTIONS
+            make build
+            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+            git submodule update --init
+            sudo make run-vectors
+            sudo make test-all
       - run:
           name: Upload to codecov
           command: |
             zip -0 ccov.zip `find . \( -name "forest*.gc*" \) -print`;
-            ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info;
+            ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" --ignore="target/debug/build/*" --ignore="tests/*" --ignore="blockchain/beacon/tests/*" -o lcov.info;
             bash <(curl -s https://codecov.io/bash) -f lcov.info;
-      # - run:
-      #     name: Upload result to codecov.io
-      #     command: bash <(curl -s https://codecov.io/bash) -f $CODECOV_OUTPUT/lcovhtml/lcov.info -F unittest;
   publish-docs:
     executor: test-executor
     description: Publish documentation to GitHub pages
+    steps:
+      - checkout
+      - when:
+          condition:
+            equal: [ main, << pipeline.git.branch >> ]
+          steps:
+            - build_setup
+            - restore_cargo_package_cache  
+            - run:
+                name: Build Docs
+                command: cargo doc --no-deps --all-features
+            - run:
+                name: Publish Docs
+                command: bash ./scripts/build-rust-docs.sh
+
+######################################################################################################################
+  #  Security audit
+######################################################################################################################
+  security:
+    executor: test-executor
+    description: Cargo audit
     steps:
       - build_setup
       - restore_cargo_package_cache
       - run:
-          name: Build Docs
-          command: cargo doc --no-deps --all-features
+          name: Install dependency auditing tool
+          command: cargo install cargo-audit
       - run:
-          name: Publish Docs
-          command: bash ./scripts/build-rust-docs.sh
+          name: Check for known security issues in dependencies
+          command: cargo audit
 
 workflows:
   setup_test:
@@ -298,8 +317,20 @@ workflows:
           - prefetch-crates
   docs:
     jobs:
-      - publish-docs
+      - publish-docs:
+        filters:
+          branches:
+            only:
+              - main
   coverage:
     jobs:
-      - coverage
-      - coverage_2
+      - prefetch-crates
+      - coverage:
+          requires:
+            - prefetch-crates
+  security:
+    jobs:
+      - prefetch-crates
+      - security:
+          requires:
+            - prefetch-crates

From 19842e10bd381603a7ed5706336807fb081faeee Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 15:15:44 -0600
Subject: [PATCH 114/118] wip

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2baa812e3a2..da9acbe78175 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -235,12 +235,14 @@ jobs:
           name: Install deps
           command: |
             brew install hwloc
-            brew install git
       - restore_cargo_package_cache
       - run:
           name: Install grcov
           command: |
             curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf -
+      - run:
+          name: Avoid hosts unknown for github
+          command: mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
       - run:
           name: Run test suite
           command: |

From 9e5fdc1b98209f14e34b748dca83cae55708b059 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 15:20:06 -0600
Subject: [PATCH 115/118] wip

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index da9acbe78175..b8cd044586f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -248,7 +248,7 @@ jobs:
           command: |
             export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Coverflow-checks=off"
             make build
-            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+            echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
             git submodule update --init
             sudo make run-vectors
             sudo make test-all

From 9f051a0c6851fa6880004ce2d91046fcfa314bab Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 15:24:43 -0600
Subject: [PATCH 116/118] wip

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b8cd044586f6..e67f52a13a1a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -242,13 +242,12 @@ jobs:
             curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf -
       - run:
           name: Avoid hosts unknown for github
-          command: mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+          command: echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
       - run:
           name: Run test suite
           command: |
             export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Coverflow-checks=off"
             make build
-            echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
             git submodule update --init
             sudo make run-vectors
             sudo make test-all

From fada8c0ee32b772f11e4e8b9822ade36921465a8 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 17:25:30 -0600
Subject: [PATCH 117/118] wip

---
 .circleci/config.yml |   22 +-
 Cargo.lock           | 1153 ++++++++++++++++++++++--------------------
 2 files changed, 618 insertions(+), 557 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e67f52a13a1a..606566ac9241 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,10 +212,13 @@ jobs:
           name: Run test vectors
           command: make run-vectors
   coverage:
-    executor: mac-executor
+    executor: test-executor
     description: Run coverage reporting using grcov
     steps:
       - checkout
+      - when:
+        condition:
+          equal: [ db/wip, << pipeline.git.branch >> ]
       - run:
           name: Install rust toolchain          
           command: |
@@ -226,15 +229,12 @@ jobs:
             export PATH="${HOME}/.cargo/bin:${PATH}"
             rustc -V
       - env_setup
+      - install_deps
       - run:
           name: Set rustc version
           command: |
             rustup default nightly
             rustup update nightly
-      - run: 
-          name: Install deps
-          command: |
-            brew install hwloc
       - restore_cargo_package_cache
       - run:
           name: Install grcov
@@ -313,9 +313,19 @@ workflows:
       - macos-build-check:
           requires:
             - prefetch-crates
+  daily-check:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      - prefetch-crates
       - install:
           requires:
-          - prefetch-crates
+            - prefetch-crates
   docs:
     jobs:
       - publish-docs:
diff --git a/Cargo.lock b/Cargo.lock
index 217fae14df9a..0e3a8aa40952 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,7 +40,7 @@ dependencies = [
  "libp2p",
  "log",
  "num-derive",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "runtime",
  "serde",
  "unsigned-varint 0.5.1",
@@ -48,9 +48,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
 dependencies = [
  "gimli",
 ]
@@ -70,28 +70,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "aes"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9"
-dependencies = [
- "aes-soft 0.3.3",
- "aesni 0.6.0",
- "block-cipher-trait",
-]
-
-[[package]]
-name = "aes"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
-dependencies = [
- "aes-soft 0.4.0",
- "aesni 0.7.0",
- "block-cipher 0.7.1",
-]
-
 [[package]]
 name = "aes"
 version = "0.5.0"
@@ -100,20 +78,18 @@ checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6"
 dependencies = [
  "aes-soft 0.5.0",
  "aesni 0.8.0",
- "block-cipher 0.8.0",
+ "block-cipher",
 ]
 
 [[package]]
-name = "aes-gcm"
+name = "aes"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
+checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
 dependencies = [
- "aead",
- "aes 0.4.0",
- "block-cipher 0.7.1",
- "ghash",
- "subtle 2.3.0",
+ "aes-soft 0.6.3",
+ "aesni 0.10.0",
+ "cipher",
 ]
 
 [[package]]
@@ -124,31 +100,23 @@ checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f"
 dependencies = [
  "aead",
  "aes 0.5.0",
- "block-cipher 0.8.0",
+ "block-cipher",
  "ghash",
  "subtle 2.3.0",
 ]
 
 [[package]]
-name = "aes-soft"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
-dependencies = [
- "block-cipher-trait",
- "byteorder 1.3.4",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.4.0"
+name = "aes-gcm"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
+checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
 dependencies = [
- "block-cipher 0.7.1",
- "byteorder 1.3.4",
- "opaque-debug 0.2.3",
+ "aead",
+ "aes 0.6.0",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle 2.3.0",
 ]
 
 [[package]]
@@ -157,38 +125,38 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6"
 dependencies = [
- "block-cipher 0.8.0",
+ "block-cipher",
  "byteorder 1.3.4",
  "opaque-debug 0.3.0",
 ]
 
 [[package]]
-name = "aesni"
-version = "0.6.0"
+name = "aes-soft"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
+checksum = "4e8bdbc97ba3854ecf597a3b69d7bd30a719dee72d22ce6313c84dbf2c8f2694"
 dependencies = [
- "block-cipher-trait",
- "opaque-debug 0.2.3",
+ "cipher",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "aesni"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
+checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a"
 dependencies = [
- "block-cipher 0.7.1",
- "opaque-debug 0.2.3",
+ "block-cipher",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "aesni"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a"
+checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
 dependencies = [
- "block-cipher 0.8.0",
+ "cipher",
  "opaque-debug 0.3.0",
 ]
 
@@ -197,9 +165,6 @@ name = "ahash"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-dependencies = [
- "const-random",
-]
 
 [[package]]
 name = "ahash"
@@ -210,11 +175,21 @@ dependencies = [
  "const-random",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2deff5792519f5985c9cdd5a0399df3ca3419114841d282bae646acadbf0a99"
+dependencies = [
+ "getrandom 0.2.0",
+ "lazy_static",
+]
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -227,7 +202,7 @@ checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
 dependencies = [
  "approx",
  "num-complex 0.2.4",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -241,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c"
+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
 
 [[package]]
 name = "approx"
@@ -251,7 +226,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -262,9 +237,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "asn1_der"
@@ -282,7 +257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -292,7 +267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -322,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "1.3.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fefeb39da249f4c33af940b779a56723ce45809ef5c54dad84bb538d4ffb6d9e"
+checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
 dependencies = [
  "async-executor",
  "async-io",
@@ -392,21 +367,21 @@ checksum = "e5444eec77a9ec2bfe4524139e09195862e981400c4358d3b760cae634e4c4ee"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.6.5"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed"
+checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1"
 dependencies = [
  "async-attributes",
  "async-global-executor",
  "async-io",
  "async-mutex",
  "blocking",
- "crossbeam-utils",
+ "crossbeam-utils 0.8.0",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -425,9 +400,9 @@ dependencies = [
 
 [[package]]
 name = "async-task"
-version = "4.0.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-tls"
@@ -435,7 +410,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "rustls",
  "webpki",
  "webpki-roots",
@@ -449,19 +424,19 @@ checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "async-tungstenite"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f06130bbd1f682f4fb6c919f0efc151e8482115c2b599451f739243d8a73ef"
+checksum = "9ce503a5cb1e7450af7d211b86b84807791b251f335b2f43f1e26b85a416f315"
 dependencies = [
  "futures-io",
  "futures-util",
  "log",
- "pin-project",
+ "pin-project 1.0.1",
  "tungstenite",
 ]
 
@@ -510,9 +485,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.53"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e"
+checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
 dependencies = [
  "addr2line",
  "cfg-if 1.0.0",
@@ -524,9 +499,9 @@ dependencies = [
 
 [[package]]
 name = "base-x"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
+checksum = "c2734baf8ed08920ccecce1b48a2dfce4ac74a973144add031163bd21a1c5dab"
 
 [[package]]
 name = "base64"
@@ -549,6 +524,12 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
 [[package]]
 name = "beacon"
 version = "0.1.0"
@@ -565,34 +546,34 @@ dependencies = [
  "hex",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "surf",
 ]
 
 [[package]]
 name = "bellperson"
-version = "0.9.3"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9655742fc4c6f41f1412dba38342af29ef2a4ad05ba44613785b0d34edff0382"
+checksum = "8be0711234ed395975b11f68f178e419272f27e6cd4b76b4a0733aeac2b3444c"
 dependencies = [
- "ahash 0.3.8",
+ "ahash 0.5.6",
  "bit-vec",
  "blake2s_simd",
  "byteorder 1.3.4",
- "crossbeam-channel",
+ "crossbeam-channel 0.5.0",
  "ff-cl-gen",
  "fff",
- "fil-ocl",
  "fs2",
  "groupy",
  "lazy_static",
  "log",
  "memmap",
  "num_cpus",
- "paired",
+ "paired 0.21.0",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "rayon",
+ "rust-gpu-tools",
  "thiserror",
 ]
 
@@ -681,22 +662,20 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
+checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
 dependencies = [
- "byte-tools",
- "byteorder 1.3.4",
  "crypto-mac 0.8.0",
  "digest 0.9.0",
- "opaque-debug 0.2.3",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "blake2b_simd"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -705,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "blake2s_simd"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44"
+checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -736,15 +715,6 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "block-cipher"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
-dependencies = [
- "generic-array 0.14.4",
-]
-
 [[package]]
 name = "block-cipher"
 version = "0.8.0"
@@ -754,23 +724,14 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
-[[package]]
-name = "block-cipher-trait"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
-dependencies = [
- "generic-array 0.12.3",
-]
-
 [[package]]
 name = "block-modes"
-version = "0.3.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529"
+checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
 dependencies = [
- "block-cipher-trait",
- "block-padding 0.1.5",
+ "block-padding 0.2.1",
+ "cipher",
 ]
 
 [[package]]
@@ -811,7 +772,7 @@ dependencies = [
  "fff",
  "groupy",
  "hkdf 0.8.0",
- "paired",
+ "paired 0.20.1",
  "rand_core 0.5.1",
  "rayon",
  "sha2ni",
@@ -826,9 +787,9 @@ checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
 [[package]]
 name = "bstr"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -844,9 +805,9 @@ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
 [[package]]
 name = "byte-slice-cast"
-version = "0.3.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
+checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81"
 
 [[package]]
 name = "byte-tools"
@@ -895,9 +856,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
 dependencies = [
  "jobserver",
 ]
@@ -930,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845"
 dependencies = [
  "stream-cipher",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -943,7 +904,7 @@ dependencies = [
  "chacha20",
  "poly1305",
  "stream-cipher",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -966,13 +927,13 @@ dependencies = [
  "forest_crypto",
  "forest_encoding",
  "forest_message",
- "futures 0.3.6",
+ "futures 0.3.7",
  "ipld_amt",
  "ipld_blockstore",
  "lazy_static",
  "log",
  "multihash 0.10.1",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "state_tree",
  "test_utils",
@@ -1003,7 +964,7 @@ dependencies = [
  "forest_libp2p",
  "forest_message",
  "forest_vm",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-util",
  "genesis",
  "hex",
@@ -1014,7 +975,7 @@ dependencies = [
  "libp2p",
  "log",
  "lru",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "pretty_env_logger",
  "rand 0.7.3",
  "serde",
@@ -1033,11 +994,20 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
  "libc",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "time 0.1.44",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "cl-sys"
 version = "0.4.2"
@@ -1115,7 +1085,7 @@ version = "0.1.0"
 dependencies = [
  "filecoin-proofs-api",
  "forest_cid",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.7.3",
 ]
 
@@ -1180,33 +1150,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "regex",
- "terminal_size",
- "termios",
- "unicode-width",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "console"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b1aacfaffdbff75be81c15a399b4bedf78aaefe840e8af1d299ac2ade885d2"
+checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "regex",
  "terminal_size",
- "termios",
  "unicode-width",
  "winapi 0.3.9",
  "winapi-util",
@@ -1234,9 +1186,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
 
 [[package]]
 name = "constant_time_eq"
@@ -1246,26 +1198,26 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "cookie"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
+checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f"
 dependencies = [
- "aes-gcm 0.6.0",
+ "aes-gcm 0.8.0",
  "base64 0.12.3",
- "hkdf 0.9.0",
- "hmac 0.8.1",
+ "hkdf 0.10.0",
+ "hmac 0.10.1",
  "percent-encoding",
  "rand 0.7.3",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "time 0.2.22",
  "version_check",
 ]
 
 [[package]]
 name = "core-foundation"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1273,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.7.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "cpuid-bool"
@@ -1285,11 +1237,11 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1305,7 +1257,7 @@ dependencies = [
  "csv",
  "itertools 0.9.0",
  "lazy_static",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "oorandom",
  "plotters",
  "rayon",
@@ -1335,11 +1287,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-channel 0.4.4",
+ "crossbeam-deque 0.7.3",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-queue 0.2.3",
+ "crossbeam-utils 0.7.2",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-channel 0.5.0",
+ "crossbeam-deque 0.8.0",
+ "crossbeam-epoch 0.9.0",
+ "crossbeam-queue 0.3.0",
+ "crossbeam-utils 0.8.0",
 ]
 
 [[package]]
@@ -1348,21 +1314,42 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.0",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch 0.9.0",
+ "crossbeam-utils 0.8.0",
+]
+
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.2"
@@ -1371,13 +1358,27 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg",
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
  "memoffset",
  "scopeguard",
 ]
 
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils 0.8.0",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.2.3"
@@ -1385,10 +1386,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b2a58563f049aa3bae172bc4120f093b5901161c629f280a1f40ba55317d774"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.0",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.7.2"
@@ -1400,6 +1411,18 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "const_fn",
+ "lazy_static",
+]
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1426,11 +1449,21 @@ dependencies = [
  "subtle 2.3.0",
 ]
 
+[[package]]
+name = "crypto-mac"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
+dependencies = [
+ "generic-array 0.14.4",
+ "subtle 2.3.0",
+]
+
 [[package]]
 name = "csv"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
 dependencies = [
  "bstr",
  "csv-core",
@@ -1455,7 +1488,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
+]
+
+[[package]]
+name = "ctr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
+dependencies = [
+ "cipher",
 ]
 
 [[package]]
@@ -1509,7 +1551,7 @@ dependencies = [
  "digest 0.8.1",
  "rand_core 0.5.1",
  "subtle 2.3.0",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -1522,7 +1564,7 @@ dependencies = [
  "digest 0.9.0",
  "rand_core 0.5.1",
  "subtle 2.3.0",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -1546,7 +1588,7 @@ dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
  "strsim 0.9.3",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1557,35 +1599,33 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d0e2d24e5ee3b23a01de38eefdcd978907890701f08ffffd4cb457ca4ee8d6"
+checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de6489dde5128f5ab2f71f88f8807a237cecf08d96dc7ca4be64e0730dc7d961"
+checksum = "0a94feec3d2ba66c0b6621bca8bc6f68415b1e5c69af3586fdd0af9fd9f29b17"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2d6daefd5f1d4b74a891a5d2ab7dccba028d423107c074232a0c5dc0d40a9e"
+checksum = "f0f83e699727abca3c56e187945f303389590305ab2f0185ea445aa66e8d5f2a"
 dependencies = [
  "data-encoding",
- "proc-macro-hack",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1608,7 +1648,7 @@ dependencies = [
  "derive_builder_core",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1620,18 +1660,19 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "dialoguer"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aa86af7b19b40ef9cbef761ed411a49f0afa06b7b6dcd3dfe2f96a3c546138"
+checksum = "70f807b2943dc90f9747497d9d65d7e92472149be0b88bf4ce1201b4ac979c26"
 dependencies = [
- "console 0.11.3",
+ "console",
  "lazy_static",
  "tempfile",
+ "zeroize 0.9.3",
 ]
 
 [[package]]
@@ -1658,6 +1699,16 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "dirs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs"
 version = "3.0.1"
@@ -1719,8 +1770,8 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.1",
- "zeroize",
+ "sha2 0.9.2",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -1737,11 +1788,11 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2"
+checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1829,7 +1880,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "synstructure",
 ]
 
@@ -1850,9 +1901,9 @@ dependencies = [
 
 [[package]]
 name = "ff-cl-gen"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8350e4691067d53e0eb3ca652d84112540e426d7962e9ac1a582c1af1af1edf6"
+checksum = "c37f4f4ccbc173bd5abd9251222392c564f7dc8d9a5ddde6cf3fe55c163d465f"
 dependencies = [
  "fff",
  "itertools 0.8.2",
@@ -1880,24 +1931,10 @@ checksum = "844b389fbe323d3b35ed1b3b119e75b11dca536d291d31342acea5b4c8984558"
 dependencies = [
  "num-bigint 0.2.6",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
-]
-
-[[package]]
-name = "fil-blst"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe1006774dcb6e0656cdab321651ded5cbaa2c0a6eeb27972f980973b24cbe4"
-dependencies = [
- "bindgen",
- "cc",
- "fff",
- "glob",
- "groupy",
- "paired",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1910,7 +1947,7 @@ dependencies = [
  "fil-ocl-core",
  "futures 0.1.30",
  "nodrop",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "qutex",
 ]
 
@@ -1925,29 +1962,11 @@ dependencies = [
  "enum_primitive",
  "failure",
  "num-complex 0.1.43",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "ocl-core-vector",
  "rustc_version 0.1.7",
 ]
 
-[[package]]
-name = "fil-sapling-crypto"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca2b7386602eb7eaa95b74a7c9acf152d06a28e4ce6d0e725035b4f628ff7"
-dependencies = [
- "bellperson",
- "blake2b_simd",
- "blake2s_simd",
- "byteorder 1.3.4",
- "cc",
- "fff",
- "lazy_static",
- "paired",
- "rand 0.7.3",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "fil_logger"
 version = "0.1.2"
@@ -1978,16 +1997,16 @@ dependencies = [
  "ipld_amt",
  "lazy_static",
  "num-derive",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "filecoin-proofs"
-version = "5.2.3"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32bff3a15dcce2ae34966ba6032ed4f90832c958b62dc615eba2fcf55cd3934"
+checksum = "c49a59b1148dcdb4711bec11faa88f8b350a4edd8326d2bb7b2437c4a019fbec"
 dependencies = [
  "anyhow",
  "bellperson",
@@ -2002,10 +2021,9 @@ dependencies = [
  "dialoguer",
  "env_proxy",
  "fff",
- "fil-sapling-crypto",
  "fil_logger",
  "flate2",
- "generic-array 0.13.2",
+ "generic-array 0.14.4",
  "groupy",
  "hex",
  "humansize",
@@ -2015,7 +2033,6 @@ dependencies = [
  "log",
  "memmap",
  "merkletree",
- "paired",
  "pbr",
  "phase21",
  "rand 0.7.3",
@@ -2026,7 +2043,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "simplelog",
  "storage-proofs",
  "structopt",
@@ -2036,24 +2053,24 @@ dependencies = [
 
 [[package]]
 name = "filecoin-proofs-api"
-version = "5.2.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0cd82d2ae0577885bd03f742d627c6ffd424294a1163db172b9382715d382d"
+checksum = "b5cd67c8edf6905c6041ee733f2a7efe48394276f32a351f23bcb9f1453a33da"
 dependencies = [
  "anyhow",
+ "bellperson",
  "bincode",
  "filecoin-proofs",
- "paired",
  "serde",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "winapi 0.3.9",
@@ -2067,11 +2084,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee"
+checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "crc32fast",
  "libc",
  "miniz_oxide",
@@ -2096,7 +2113,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b02e0d3667b27514149c1ac9b372d700f3e6df4bbaf6b7c5df12915de2996049"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "smallvec",
 ]
 
@@ -2143,7 +2160,7 @@ dependencies = [
  "forest_cid",
  "forest_encoding",
  "forest_libp2p",
- "futures 0.3.6",
+ "futures 0.3.7",
  "genesis",
  "hex",
  "ipld_blockstore",
@@ -2173,7 +2190,7 @@ dependencies = [
  "forest_encoding",
  "leb128",
  "num-derive",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "thiserror",
 ]
@@ -2182,7 +2199,7 @@ dependencies = [
 name = "forest_bigint"
 version = "0.1.1"
 dependencies = [
- "num-bigint 0.3.0",
+ "num-bigint 0.3.1",
  "num-integer",
  "serde",
  "serde_bytes",
@@ -2210,7 +2227,7 @@ dependencies = [
  "lazy_static",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "test_utils",
  "thiserror",
 ]
@@ -2253,7 +2270,7 @@ dependencies = [
  "forest_encoding",
  "libsecp256k1",
  "num-derive",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.7.3",
  "rand_chacha",
  "serde",
@@ -2319,7 +2336,7 @@ dependencies = [
  "forest_crypto",
  "forest_encoding",
  "forest_message",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-util",
  "futures_codec",
  "genesis",
@@ -2348,7 +2365,7 @@ dependencies = [
  "forest_encoding",
  "forest_json_utils",
  "forest_vm",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "serde_json",
 ]
@@ -2363,7 +2380,7 @@ dependencies = [
  "forest_encoding",
  "lazy_static",
  "num-derive",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "thiserror",
 ]
@@ -2418,9 +2435,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e"
+checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2433,9 +2450,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74"
+checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2443,15 +2460,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b"
+checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab"
+checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2461,15 +2478,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c"
+checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
 
 [[package]]
 name = "futures-lite"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9"
+checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2482,27 +2499,27 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f57ed14da4603b2554682e9f2ff3c65d7567b53188db96cb71538217fc64581b"
+checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd"
+checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94"
+checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
 dependencies = [
  "once_cell",
 ]
@@ -2515,9 +2532,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34"
+checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
 dependencies = [
  "futures 0.1.30",
  "futures-channel",
@@ -2527,7 +2544,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project",
+ "pin-project 1.0.1",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2541,9 +2558,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
 dependencies = [
  "bytes",
- "futures 0.3.6",
+ "futures 0.3.7",
  "memchr",
- "pin-project",
+ "pin-project 0.4.27",
 ]
 
 [[package]]
@@ -2658,9 +2675,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "glob"
@@ -2670,9 +2687,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "globset"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
+checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -2708,9 +2725,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
  "bytes",
  "fnv",
@@ -2723,6 +2740,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
@@ -2741,21 +2759,14 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
-dependencies = [
- "ahash 0.3.8",
- "autocfg",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash 0.4.6",
+]
 
 [[package]]
 name = "heck"
@@ -2799,12 +2810,12 @@ dependencies = [
 
 [[package]]
 name = "hkdf"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9"
+checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f"
 dependencies = [
  "digest 0.9.0",
- "hmac 0.8.1",
+ "hmac 0.10.1",
 ]
 
 [[package]]
@@ -2819,11 +2830,11 @@ dependencies = [
 
 [[package]]
 name = "hmac"
-version = "0.8.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
+checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
 dependencies = [
- "crypto-mac 0.8.0",
+ "crypto-mac 0.10.0",
  "digest 0.9.0",
 ]
 
@@ -2861,9 +2872,9 @@ dependencies = [
 
 [[package]]
 name = "http-client"
-version = "6.1.0"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc054d9c24096dde2dc73c0d37fa3f9269443dbf4a7ba47598ec9cffe71220e"
+checksum = "010092b71b94ee49293995625ce7a607778b8b4099c8088fa84fd66bd3e0f21c"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2874,13 +2885,16 @@ dependencies = [
 
 [[package]]
 name = "http-types"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e703a631784b7881751ebff731cd645eb4c7f9b6288c19178ba9e1c4788d39"
+checksum = "ffa4e35764a650ce8e709c50e985431eb8963eee7fc793d923134d4aa8e530b4"
 dependencies = [
  "anyhow",
+ "async-channel",
  "async-std",
+ "base64 0.13.0",
  "cookie",
+ "futures-lite",
  "infer",
  "pin-project-lite",
  "rand 0.7.3",
@@ -2933,9 +2947,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.8"
+version = "0.13.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835"
+checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2947,7 +2961,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project",
+ "pin-project 1.0.1",
  "socket2",
  "tokio",
  "tower-service",
@@ -2998,11 +3012,11 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a68371cf417889c9d7f98235b7102ea7c54fc59bcbd22f3dea785be9d27e40"
+checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
- "console 0.12.0",
+ "console",
  "lazy_static",
  "number_prefix",
  "regex",
@@ -3025,11 +3039,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -3062,7 +3076,7 @@ dependencies = [
  "ipld_hamt",
  "lazy_static",
  "log",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rayon",
  "runtime",
  "state_tree",
@@ -3117,7 +3131,7 @@ dependencies = [
  "lazycell",
  "serde",
  "serde_bytes",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "thiserror",
  "unsigned-varint 0.5.1",
 ]
@@ -3130,21 +3144,21 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
 [[package]]
 name = "isahc"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac245314704d62c121785203fb4d6f41f137167fcc91beec0b55bd6c4bb8c800"
+checksum = "0cf84ee8215bcaa999a24870485ef49d051cd858985a80d123e56be2d921d811"
 dependencies = [
  "bytes",
- "crossbeam-channel",
- "crossbeam-utils",
+ "crossbeam-channel 0.5.0",
+ "crossbeam-utils 0.8.0",
  "curl",
  "curl-sys",
  "futures-channel",
  "futures-io",
  "futures-util",
  "http",
- "lazy_static",
  "log",
+ "once_cell",
  "slab",
  "sluice",
  "tracing",
@@ -3202,7 +3216,7 @@ dependencies = [
  "bytes",
  "erased-serde",
  "extensions",
- "futures 0.3.6",
+ "futures 0.3.7",
  "jsonrpc-v2-macros",
  "serde",
  "serde_json",
@@ -3215,7 +3229,7 @@ source = "git+https://github.com/ChainSafe/jsonrpc-v2#d1d060576ede0bd76eee173545
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3229,7 +3243,7 @@ dependencies = [
  "bs58",
  "bytes",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer",
  "globset",
  "hashbrown 0.7.2",
@@ -3238,7 +3252,7 @@ dependencies = [
  "lazy_static",
  "log",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -3260,7 +3274,7 @@ dependencies = [
  "Inflector",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3355,9 +3369,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "libloading"
@@ -3393,7 +3407,7 @@ checksum = "76c101edbb9c06955fd4085b77d2abc31cf3650134d77068b35c44967756ada8"
 dependencies = [
  "atomic",
  "bytes",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
@@ -3411,7 +3425,7 @@ dependencies = [
  "multihash 0.11.4",
  "parity-multiaddr",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.27",
  "smallvec",
  "wasm-timer",
 ]
@@ -3424,7 +3438,7 @@ checksum = "c62ec0af0cf8e8bb1cf125bc35155696a3d174c54a88426b759206954d8f4f80"
 dependencies = [
  "async-std",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p",
  "log",
  "prost",
@@ -3446,7 +3460,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer",
  "lazy_static",
  "libsecp256k1",
@@ -3455,7 +3469,7 @@ dependencies = [
  "multistream-select",
  "parity-multiaddr",
  "parking_lot 0.10.2",
- "pin-project",
+ "pin-project 0.4.27",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3466,7 +3480,7 @@ dependencies = [
  "thiserror",
  "unsigned-varint 0.4.0",
  "void",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -3476,7 +3490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3485,7 +3499,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce8769cfe677a567d2677dc02a9e5be27a24acf1ff78a59cef425caae009a6a"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
 ]
@@ -3500,7 +3514,7 @@ dependencies = [
  "byteorder 1.3.4",
  "bytes",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "hex_fmt",
  "libp2p-core",
@@ -3522,7 +3536,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41efcb5b521b65d2c45432a244ce6427cdd3649228cd192f397d1fa67682aef2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3542,7 +3556,7 @@ dependencies = [
  "bytes",
  "either",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
@@ -3569,7 +3583,7 @@ dependencies = [
  "data-encoding",
  "dns-parser",
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
@@ -3589,7 +3603,7 @@ checksum = "df9e79541e71590846f773efce1b6d0538804992ee54ff2f407e05d63a9ddc23"
 dependencies = [
  "bytes",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3605,7 +3619,7 @@ checksum = "0beba6459d06153f5f8e23da3df1d2183798b1f457c7c9468ff99760bcbcc60b"
 dependencies = [
  "bytes",
  "curve25519-dalek 2.1.0",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3616,7 +3630,7 @@ dependencies = [
  "snow",
  "static_assertions",
  "x25519-dalek 0.6.0",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -3625,7 +3639,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "670261ef938567b614746b078e049b03b55617538a8d415071c518f97532d043"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3641,7 +3655,7 @@ source = "git+https://github.com/ChainSafe/rust-libp2p?rev=b1fe08464ce4d395e92a5
 dependencies = [
  "async-std",
  "async-trait",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "smallvec",
@@ -3654,7 +3668,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57e4a7e64156e9d1a2daae36b5d791f057b9c53c9364a8e75f7f9848b54f9d68"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3670,7 +3684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f65400ccfbbf9a356733bceca6c519c9db0deb5fbcc0b81f89837c4cd53997"
 dependencies = [
  "async-std",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer",
  "get_if_addrs",
  "ipnet",
@@ -3685,7 +3699,7 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3969ead4ce530efb6f304623924245caf410f3b0b0139bd7007f205933788aa"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "parking_lot 0.10.2",
  "thiserror",
@@ -3761,11 +3775,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153"
+checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0"
 dependencies = [
- "hashbrown 0.8.2",
+ "hashbrown 0.9.1",
 ]
 
 [[package]]
@@ -3807,9 +3821,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memmap"
@@ -3868,14 +3882,14 @@ dependencies = [
  "forest_encoding",
  "forest_message",
  "forest_vm",
- "futures 0.3.6",
+ "futures 0.3.7",
  "interpreter",
  "ipld_blockstore",
  "key_management",
  "libsecp256k1",
  "log",
  "lru",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.7.3",
  "serde",
  "state_manager",
@@ -3976,8 +3990,8 @@ dependencies = [
  "blake2b_simd",
  "blake2s_simd",
  "digest 0.9.0",
- "sha-1 0.9.1",
- "sha2 0.9.1",
+ "sha-1 0.9.2",
+ "sha2 0.9.2",
  "sha3 0.9.1",
  "unsigned-varint 0.5.1",
 ]
@@ -3990,16 +4004,16 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "multistream-select"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5"
+checksum = "36a6aa6e32fbaf16795142335967214b8564a7a4661eb6dc846ef343a6e00ac1"
 dependencies = [
  "bytes",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
- "pin-project",
+ "pin-project 1.0.1",
  "smallvec",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
 ]
 
 [[package]]
@@ -4014,7 +4028,7 @@ dependencies = [
  "matrixmultiply",
  "num-complex 0.2.4",
  "num-rational 0.2.4",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.7.3",
  "rand_distr",
  "typenum",
@@ -4022,9 +4036,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
+checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372"
 dependencies = [
  "lazy_static",
  "libc",
@@ -4050,26 +4064,25 @@ dependencies = [
 
 [[package]]
 name = "neptune"
-version = "1.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7960aacf040fc6cf1b76e04f8787f29ead765ba02088869dd179ebe01e306fa1"
+checksum = "453fff5e63fb9155c6571ca4fe3d1799ae57a66d5c27346a201eafd8c655a09a"
 dependencies = [
  "bellperson",
  "blake2s_simd",
  "byteorder 1.3.4",
  "fff",
- "generic-array 0.13.2",
+ "generic-array 0.14.4",
  "lazy_static",
  "log",
  "neptune-triton",
- "paired",
 ]
 
 [[package]]
 name = "neptune-triton"
-version = "1.1.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c06d221737d1bc51247c5e82865a908fa4e821347933fa34de1a5adee6511ab"
+checksum = "9f9b8b2d3deb9989812a85ac2562eeacab362ad30de3fae867bdb6cc9be75935"
 dependencies = [
  "cc",
 ]
@@ -4131,7 +4144,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-rational 0.1.42",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -4141,7 +4154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1"
 dependencies = [
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.4.6",
  "rustc-serialize",
 ]
@@ -4154,18 +4167,18 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0"
+checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -4174,7 +4187,7 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rustc-serialize",
 ]
 
@@ -4185,39 +4198,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
  "autocfg",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-derive"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
  "autocfg",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
+checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -4228,7 +4241,7 @@ checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
 dependencies = [
  "num-bigint 0.1.44",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rustc-serialize",
 ]
 
@@ -4240,7 +4253,7 @@ checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -4249,14 +4262,14 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
  "libm",
@@ -4280,9 +4293,9 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
 
 [[package]]
 name = "object"
-version = "0.21.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
 
 [[package]]
 name = "ocl-core-vector"
@@ -4382,6 +4395,21 @@ dependencies = [
  "groupy",
  "hkdf 0.8.0",
  "rand_core 0.5.1",
+]
+
+[[package]]
+name = "paired"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42fc2daf8d5a8e22a9833f798e72c0d6862b5f0288f0a2d289b37cd03fa5e283"
+dependencies = [
+ "blake2b_simd",
+ "byteorder 1.3.4",
+ "digest 0.9.0",
+ "fff",
+ "groupy",
+ "hkdf 0.10.0",
+ "rand_core 0.5.1",
  "serde",
 ]
 
@@ -4392,7 +4420,7 @@ dependencies = [
  "async-std",
  "blake2b_simd",
  "fil_types",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "pbr",
  "pin-project-lite",
@@ -4403,9 +4431,9 @@ dependencies = [
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257"
+checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a"
 dependencies = [
  "arrayref",
  "bs58",
@@ -4415,7 +4443,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint 0.4.0",
+ "unsigned-varint 0.5.1",
  "url",
 ]
 
@@ -4481,7 +4509,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74333e3d1d8bced07fd0b8599304825684bcdb4a1fcc6fa6a470e6e08cefd254"
 dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.4.4",
  "libc",
  "time 0.1.44",
  "winapi 0.3.9",
@@ -4522,19 +4550,18 @@ dependencies = [
 
 [[package]]
 name = "phase21"
-version = "0.8.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f11d2cea752b0c881f90b7c19208af1d08bb6d4e7cebe97c98af5ed0e3cd57"
+checksum = "e2e4dd94fa82b154cb22a5d708d231592d1310da9402825d1e338aa5b6864d65"
 dependencies = [
  "bellperson",
  "blake2b_simd",
  "byteorder 1.3.4",
- "crossbeam",
+ "crossbeam 0.8.0",
  "fff",
  "groupy",
  "log",
  "num_cpus",
- "paired",
  "rand 0.7.3",
  "rand_chacha",
  "rayon",
@@ -4546,7 +4573,16 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
 dependencies = [
- "pin-project-internal",
+ "pin-project-internal 0.4.27",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+dependencies = [
+ "pin-project-internal 1.0.1",
 ]
 
 [[package]]
@@ -4557,14 +4593,25 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95"
+checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
 
 [[package]]
 name = "pin-utils"
@@ -4585,16 +4632,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
 dependencies = [
  "js-sys",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "polling"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab773feb154f12c49ffcfd66ab8bdcf9a1843f950db48b0d8be9d4393783b058"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -4636,9 +4683,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "pretty_assertions"
@@ -4680,7 +4727,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "version_check",
 ]
 
@@ -4697,9 +4744,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.18"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
@@ -4763,7 +4810,7 @@ dependencies = [
  "itertools 0.8.2",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -4806,7 +4853,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "084325f9fb9f2c23e4c225be1a4799583badd1666c3c6bbc67bacc6147f20ba1"
 dependencies = [
- "crossbeam",
+ "crossbeam 0.7.3",
  "futures 0.1.30",
 ]
 
@@ -4922,25 +4969,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg",
- "crossbeam-deque",
+ "crossbeam-deque 0.8.0",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
+ "crossbeam-channel 0.5.0",
+ "crossbeam-deque 0.8.0",
+ "crossbeam-utils 0.8.0",
  "lazy_static",
  "num_cpus",
 ]
@@ -4973,9 +5020,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4994,9 +5041,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
 
 [[package]]
 name = "remove_dir_all"
@@ -5091,7 +5138,7 @@ dependencies = [
  "forest_encoding",
  "forest_libp2p",
  "forest_message",
- "futures 0.3.6",
+ "futures 0.3.7",
  "hex",
  "interpreter",
  "ipld_blockstore",
@@ -5100,7 +5147,7 @@ dependencies = [
  "key_management",
  "log",
  "message_pool",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "rand 0.7.3",
  "rand_distr",
  "serde",
@@ -5157,14 +5204,27 @@ dependencies = [
  "base64 0.12.3",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
+]
+
+[[package]]
+name = "rust-gpu-tools"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6c9f6405dd1a52ca610445abadb9faa3216f0f9a6e136c4b66df5e655224e52"
+dependencies = [
+ "dirs 2.0.2",
+ "fil-ocl",
+ "lazy_static",
+ "sha2 0.8.2",
+ "thiserror",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
 
 [[package]]
 name = "rustc-hash"
@@ -5221,8 +5281,8 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.6",
- "pin-project",
+ "futures 0.3.7",
+ "pin-project 0.4.27",
  "static_assertions",
 ]
 
@@ -5269,9 +5329,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "0.4.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
+checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
 dependencies = [
  "bitflags 1.2.1",
  "core-foundation",
@@ -5282,9 +5342,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "0.4.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
+checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5356,7 +5416,7 @@ checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5390,7 +5450,7 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5411,7 +5471,7 @@ checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5453,7 +5513,7 @@ dependencies = [
  "forest_message",
  "forest_vm",
  "hex",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "serde",
  "serde_json",
 ]
@@ -5472,12 +5532,12 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770"
+checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -5503,12 +5563,12 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
+checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "cpuid-bool",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
@@ -5597,7 +5657,7 @@ checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b"
 dependencies = [
  "chrono",
  "num-bigint 0.2.6",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -5648,7 +5708,7 @@ dependencies = [
  "rand_core 0.5.1",
  "ring",
  "rustc_version 0.2.3",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "subtle 2.3.0",
  "x25519-dalek 1.1.0",
 ]
@@ -5673,7 +5733,7 @@ checksum = "1c9dab3f95c9ebdf3a88268c19af668f637a3c5039c2c56ff2d40b1b2d64a25b"
 dependencies = [
  "base64 0.11.0",
  "bytes",
- "futures 0.3.6",
+ "futures 0.3.7",
  "http",
  "httparse",
  "log",
@@ -5720,7 +5780,7 @@ dependencies = [
  "forest_encoding",
  "forest_message",
  "forest_vm",
- "futures 0.3.6",
+ "futures 0.3.7",
  "interpreter",
  "ipld_amt",
  "ipld_blockstore",
@@ -5728,7 +5788,7 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "log",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "runtime",
  "serde",
  "state_tree",
@@ -5809,7 +5869,7 @@ dependencies = [
  "quote 1.0.7",
  "serde",
  "serde_derive",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5825,7 +5885,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5836,9 +5896,9 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
 [[package]]
 name = "storage-proofs"
-version = "5.2.3"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22951abf58768eb8a6bdb91a2a7a6b92a82088add06a4939f478888f2c5bad72"
+checksum = "12e40112e2867c532f611c3fc4af826a6e9db2144e269fda545826375bafb084"
 dependencies = [
  "storage-proofs-core",
  "storage-proofs-porep",
@@ -5847,11 +5907,11 @@ dependencies = [
 
 [[package]]
 name = "storage-proofs-core"
-version = "5.2.3"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00072684722335fabd2aea77e5486cf566bdfd1c5809d2cdde58d083e890ffb1"
+checksum = "191e0ad20e15d20dd2a173338816970d74654f0fd0ae89db188e9993760b98cb"
 dependencies = [
- "aes 0.3.2",
+ "aes 0.6.0",
  "anyhow",
  "bellperson",
  "blake2b_simd",
@@ -5860,10 +5920,8 @@ dependencies = [
  "byteorder 1.3.4",
  "config",
  "fff",
- "fil-blst",
- "fil-sapling-crypto",
  "fs2",
- "generic-array 0.13.2",
+ "generic-array 0.14.4",
  "hex",
  "itertools 0.9.0",
  "lazy_static",
@@ -5872,13 +5930,12 @@ dependencies = [
  "merkletree",
  "neptune",
  "num_cpus",
- "paired",
  "rand 0.7.3",
  "rand_chacha",
  "rayon",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "tempfile",
  "thiserror",
  "toml",
@@ -5886,20 +5943,19 @@ dependencies = [
 
 [[package]]
 name = "storage-proofs-porep"
-version = "5.2.3"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9084ddbc81f03284def425b8d24b621aa99571535af6ab54e3a8f284745cea05"
+checksum = "b20609e5bb968c708747c3922e6cd15661cb1515d5508bd96e0a4f1600acabe0"
 dependencies = [
  "anyhow",
  "bellperson",
  "bincode",
  "byte-slice-cast",
  "byteorder 1.3.4",
- "crossbeam",
+ "crossbeam 0.8.0",
  "digest 0.9.0",
  "fff",
- "fil-sapling-crypto",
- "generic-array 0.13.2",
+ "generic-array 0.14.4",
  "hex",
  "hwloc",
  "lazy_static",
@@ -5909,44 +5965,41 @@ dependencies = [
  "merkletree",
  "neptune",
  "num-bigint 0.2.6",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "num_cpus",
- "paired",
  "pretty_assertions",
  "rand 0.7.3",
  "rayon",
  "serde",
  "serde_json",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "sha2raw",
  "storage-proofs-core",
 ]
 
 [[package]]
 name = "storage-proofs-post"
-version = "5.2.3"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d4cc4e782b2210b1bb637162d56477e5b2f1b2257ca3e7c022782307cd007f9"
+checksum = "48d3f62e46745d71c5359472a7f1017782eca46ea0c186dcb1a1cf5fad1e5c26"
 dependencies = [
  "anyhow",
  "bellperson",
  "blake2b_simd",
  "blake2s_simd",
  "byteorder 1.3.4",
- "crossbeam",
+ "crossbeam 0.8.0",
  "fff",
- "fil-sapling-crypto",
- "generic-array 0.13.2",
+ "generic-array 0.14.4",
  "hex",
  "log",
  "merkletree",
  "neptune",
  "num_cpus",
- "paired",
  "rand 0.7.3",
  "rayon",
  "serde",
- "sha2 0.9.1",
+ "sha2 0.9.2",
  "storage-proofs-core",
 ]
 
@@ -5956,7 +6009,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89"
 dependencies = [
- "block-cipher 0.8.0",
+ "block-cipher",
  "generic-array 0.14.4",
 ]
 
@@ -6005,7 +6058,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -6022,9 +6075,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "surf"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d38339c05d2bc84595d56e27aa07566e7b59767ea5cb5c78991b499cd188060"
+checksum = "7189c787d96fe18fef704950de76d590022d9d70858a4a201e1f07a0666882ea"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6055,9 +6108,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.44"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -6072,7 +6125,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "unicode-xid 0.2.1",
 ]
 
@@ -6131,15 +6184,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "termios"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "test_utils"
 version = "0.1.0"
@@ -6169,22 +6213,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -6242,7 +6286,7 @@ dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
  "standback",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -6275,8 +6319,8 @@ dependencies = [
  "blake2s_simd",
  "digest 0.9.0",
  "generic-array 0.14.4",
- "sha-1 0.9.1",
- "sha2 0.9.1",
+ "sha-1 0.9.2",
+ "sha2 0.9.2",
  "sha3 0.9.1",
  "strobe-rs",
  "tiny-multihash-derive",
@@ -6293,7 +6337,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "synstructure",
 ]
 
@@ -6391,7 +6435,7 @@ checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -6409,7 +6453,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.27",
  "tracing",
 ]
 
@@ -6433,7 +6477,7 @@ dependencies = [
  "input_buffer",
  "log",
  "rand 0.7.3",
- "sha-1 0.9.1",
+ "sha-1 0.9.2",
  "url",
  "utf-8",
 ]
@@ -6551,10 +6595,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
 dependencies = [
+ "form_urlencoded",
  "idna",
  "matches",
  "percent-encoding",
@@ -6571,7 +6616,7 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
 name = "utils"
 version = "0.1.0"
 dependencies = [
- "dirs",
+ "dirs 3.0.1",
  "serde",
  "serde_derive",
  "toml",
@@ -6678,7 +6723,7 @@ dependencies = [
  "log",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -6712,7 +6757,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6729,7 +6774,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "js-sys",
  "parking_lot 0.11.0",
  "pin-utils",
@@ -6769,9 +6814,9 @@ dependencies = [
 
 [[package]]
 name = "wepoll-sys"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142bc2cba3fe88be1a8fcb55c727fa4cd5b0cf2d7438722792e22f26f04bc1e0"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
 dependencies = [
  "cc",
 ]
@@ -6855,7 +6900,7 @@ checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
 dependencies = [
  "curve25519-dalek 2.1.0",
  "rand_core 0.5.1",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -6866,7 +6911,7 @@ checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088"
 dependencies = [
  "curve25519-dalek 3.0.0",
  "rand_core 0.5.1",
- "zeroize",
+ "zeroize 1.1.1",
 ]
 
 [[package]]
@@ -6884,7 +6929,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "053585b18bca1a3d00e4b5ef93e72d4f49a10005374c455db7177e27149c899d"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "nohash-hasher",
  "parking_lot 0.10.2",
@@ -6898,6 +6943,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
 
+[[package]]
+name = "zeroize"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86"
+
 [[package]]
 name = "zeroize"
 version = "1.1.1"
@@ -6915,6 +6966,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.44",
+ "syn 1.0.48",
  "synstructure",
 ]

From adb821aa53215970153cf3819e18ab81e37c6dc6 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 6 Nov 2020 17:30:58 -0600
Subject: [PATCH 118/118] wip

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 606566ac9241..44d3a925d9e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -229,6 +229,7 @@ jobs:
             export PATH="${HOME}/.cargo/bin:${PATH}"
             rustc -V
       - env_setup
+      - install_rust
       - install_deps
       - run:
           name: Set rustc version