From 4dedec7e3b81b220c7d3b1c8a9ff05f53db0c6ee Mon Sep 17 00:00:00 2001
From: Mika Lindqvist <postmaster@raasu.org>
Date: Mon, 6 Feb 2023 05:50:05 +0200
Subject: [PATCH] Update zlib-ng ABI files.

---
 ...baf80882311-aarch64-unknown-linux-gnu.abi} | 690 +++++++--------
 ...baf80882311-arm-unknown-linux-gnueabi.abi} | 694 +++++++--------
 ...f80882311-arm-unknown-linux-gnueabihf.abi} | 694 +++++++--------
 ...baf80882311-powerpc-unknown-linux-gnu.abi} | 690 +++++++--------
 ...f80882311-powerpc64-unknown-linux-gnu.abi} | 688 +++++++--------
 ...0882311-powerpc64le-unknown-linux-gnu.abi} | 688 +++++++--------
 ...e4baf80882311-x86_64-pc-linux-gnu-m32.abi} | 792 +++++++++---------
 ...c155e4baf80882311-x86_64-pc-linux-gnu.abi} | 792 +++++++++---------
 test/abicheck.sh                              |   2 +-
 9 files changed, 2659 insertions(+), 3071 deletions(-)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-aarch64-unknown-linux-gnu.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-aarch64-unknown-linux-gnu.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabi.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabi.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabihf.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabihf.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc-unknown-linux-gnu.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc-unknown-linux-gnu.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64-unknown-linux-gnu.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64-unknown-linux-gnu.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64le-unknown-linux-gnu.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64le-unknown-linux-gnu.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu-m32.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu-m32.abi} (87%)
 rename test/abi/{zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu.abi => zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu.abi} (87%)

diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-aarch64-unknown-linux-gnu.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-aarch64-unknown-linux-gnu.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-aarch64-unknown-linux-gnu.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-aarch64-unknown-linux-gnu.abi
index 9aa91cef..cfc0eddc 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-aarch64-unknown-linux-gnu.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-aarch64-unknown-linux-gnu.abi
@@ -4,9 +4,7 @@
     <dependency name='ld-linux-aarch64.so.1'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_neon' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_acle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long int' size-in-bits='64' id='type-id-1'/>
@@ -790,21 +788,21 @@
       <parameter type-id='type-id-4' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -826,13 +824,13 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-12'/>
@@ -896,81 +894,72 @@
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-24' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-103'/>
-    <class-decl name='functable_s' size-in-bits='1216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-104'>
+    <class-decl name='functable_s' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='chunkcopy' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='chunkunroll' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='chunkmemset' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-113'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-42'/>
@@ -984,7 +973,7 @@
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='adler32_neon' mangled-name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_neon'>
+    <function-decl name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
@@ -993,239 +982,200 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='inflate_fast_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='crc32_acle' mangled-name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_acle'>
+    <function-decl name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-119'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-117'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
-      <parameter type-id='type-id-119'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-123'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-123'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-125'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-126'>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-127'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-128'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-131'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-132'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-12'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-133'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-12'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-134'/>
-    <typedef-decl name='gzFile' type-id='type-id-135' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-136'/>
-    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-137'>
+    <type-decl name='variadic parameter type' id='type-id-129'/>
+    <typedef-decl name='gzFile' type-id='type-id-130' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-131'/>
+    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1236,64 +1186,64 @@
         <var-decl name='pos' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-133'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-43' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-17' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-8' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-17' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-138' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/aarch64-linux-gnu/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1323,7 +1273,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='__va_list' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-139'>
+    <class-decl name='__va_list' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__stack' type-id='type-id-45' visibility='default'/>
       </data-member>
@@ -1340,10 +1290,10 @@
         <var-decl name='__vr_offs' type-id='type-id-17' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-139' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-140'/>
-    <typedef-decl name='va_list' type-id='type-id-140' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-141'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-134' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-135'/>
+    <typedef-decl name='va_list' type-id='type-id-135' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-136'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-17'/>
@@ -1352,38 +1302,38 @@
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-43' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-141' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-136' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-17' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-17'/>
@@ -1392,20 +1342,20 @@
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-142'/>
+      <return type-id='type-id-137'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='61568' id='type-id-144'>
-      <subrange length='1924' type-id='type-id-4' id='type-id-145'/>
+    <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='61568' id='type-id-139'>
+      <subrange length='1924' type-id='type-id-4' id='type-id-140'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-146'>
-      <subrange length='288' type-id='type-id-4' id='type-id-147'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-141'>
+      <subrange length='288' type-id='type-id-4' id='type-id-142'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-148'>
-      <subrange length='320' type-id='type-id-4' id='type-id-149'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-143'>
+      <subrange length='320' type-id='type-id-4' id='type-id-144'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-151'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-145' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-146'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1440,13 +1390,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-150'/>
-    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-152'>
+    <typedef-decl name='inflate_mode' type-id='type-id-146' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-145'/>
+    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-147'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-15' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mode' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='last' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1506,10 +1456,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='lencode' type-id='type-id-153' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='distcode' type-id='type-id-153' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1530,16 +1480,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='next' type-id='type-id-154' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='lens' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='work' type-id='type-id-146' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-141' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11456'>
-        <var-decl name='codes' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='73024'>
         <var-decl name='sane' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1554,7 +1504,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-155'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-138' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-150'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1565,208 +1515,204 @@
         <var-decl name='val' type-id='type-id-63' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-143'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-157'>
+    <typedef-decl name='code' type-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-138'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-152'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-156'/>
-    <typedef-decl name='in_func' type-id='type-id-158' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-159'/>
-    <typedef-decl name='out_func' type-id='type-id-160' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-162'/>
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-168'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-151'/>
+    <typedef-decl name='in_func' type-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-154'/>
+    <typedef-decl name='out_func' type-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-157'/>
+    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-164'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-159' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-161' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-154' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-156' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-4'/>
-      <return type-id='type-id-12'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-160'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-156'/>
-      <parameter type-id='type-id-168'/>
+      <parameter type-id='type-id-151'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-162'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-168'/>
+      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-163'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-166'>
+    <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-167'>
+    <function-type size-in-bits='64' id='type-id-162'>
       <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-159'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='9216' id='type-id-170'>
-      <subrange length='288' type-id='type-id-4' id='type-id-147'/>
+    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='9216' id='type-id-166'>
+      <subrange length='288' type-id='type-id-4' id='type-id-142'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='960' id='type-id-171'>
-      <subrange length='30' type-id='type-id-4' id='type-id-172'/>
+    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='960' id='type-id-167'>
+      <subrange length='30' type-id='type-id-4' id='type-id-168'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-173' size-in-bits='928' id='type-id-174'>
-      <subrange length='29' type-id='type-id-4' id='type-id-175'/>
+    <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='928' id='type-id-170'>
+      <subrange length='29' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-173' size-in-bits='960' id='type-id-176'>
-      <subrange length='30' type-id='type-id-4' id='type-id-172'/>
+    <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='960' id='type-id-172'>
+      <subrange length='30' type-id='type-id-4' id='type-id-168'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-177'>
-      <subrange length='256' type-id='type-id-4' id='type-id-178'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-173'>
+      <subrange length='256' type-id='type-id-4' id='type-id-174'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-179'>
-      <subrange length='512' type-id='type-id-4' id='type-id-180'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-175'>
+      <subrange length='512' type-id='type-id-4' id='type-id-176'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-169'/>
-    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-173'/>
-    <var-decl name='static_ltree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-171' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-179' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-165'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-169'/>
+    <var-decl name='static_ltree' type-id='type-id-166' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-167' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1785,16 +1731,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-181' size-in-bits='640' id='type-id-182'>
-      <subrange length='10' type-id='type-id-4' id='type-id-183'/>
+    <array-type-def dimensions='1' type-id='type-id-177' size-in-bits='640' id='type-id-178'>
+      <subrange length='10' type-id='type-id-4' id='type-id-179'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-184'>
-      <subrange length='38' type-id='type-id-4' id='type-id-185'/>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-180'>
+      <subrange length='38' type-id='type-id-4' id='type-id-181'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-186'/>
-    <var-decl name='zlibng_string' type-id='type-id-184' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-182'/>
+    <var-decl name='zng_vstring' type-id='type-id-180' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1804,13 +1750,13 @@
       <parameter type-id='type-id-17' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-182' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/aarch64-linux-gnu/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/aarch64-linux-gnu/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-17'/>
@@ -1823,9 +1769,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-187' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-188'>
+    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-183' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-184'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-132' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='mode' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1888,44 +1834,44 @@
         <var-decl name='strm' type-id='type-id-46' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-188' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-187'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/aarch64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-189'/>
-    <typedef-decl name='ssize_t' type-id='type-id-189' filepath='/usr/aarch64-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-142'/>
-    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-190'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-184' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-183'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/aarch64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-185'/>
+    <typedef-decl name='ssize_t' type-id='type-id-185' filepath='/usr/aarch64-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-137'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-186'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-186'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-12'/>
@@ -1935,10 +1881,10 @@
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-142'/>
+      <return type-id='type-id-137'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/aarch64-linux-gnu/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/aarch64-linux-gnu/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabi.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabi.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabi.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabi.abi
index 7a99d6d4..414f8a96 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabi.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabi.abi
@@ -4,9 +4,7 @@
     <dependency name='ld-linux.so.3'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_neon' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_acle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long long int' size-in-bits='64' id='type-id-1'/>
@@ -778,21 +776,21 @@
       <parameter type-id='type-id-31' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -814,13 +812,13 @@
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
@@ -892,81 +890,72 @@
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-23' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-105'/>
-    <class-decl name='functable_s' size-in-bits='608' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-106'>
+    <class-decl name='functable_s' size-in-bits='544' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-106'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='chunkcopy' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='chunkunroll' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='chunkmemset' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='longest_match' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='longest_match_slow' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='slide_hash' type-id='type-id-119' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='32' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='32' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='32' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='32' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-115'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-43'/>
@@ -980,7 +969,7 @@
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='adler32_neon' mangled-name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='adler32_neon'>
+    <function-decl name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
@@ -989,239 +978,200 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='99' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='89' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='100' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='101' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='102' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='103' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='90' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='115' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='crc32_acle' mangled-name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_acle'>
+    <function-decl name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='126' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='128' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='136' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='165' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='169' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='178' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='186' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='185' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='193' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='200' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='208' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='219' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='220' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='228' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='237' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='245' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='32' id='type-id-120'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-121'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-122'>
+      <parameter type-id='type-id-119'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-123'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-124'>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-125'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-126'>
+    <function-type size-in-bits='32' id='type-id-124'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='32' id='type-id-125'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-126'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-127'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-128'>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-129'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-95'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-130'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-131'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-133'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-134'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-4'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-135'>
-      <parameter type-id='type-id-95'/>
-      <return type-id='type-id-4'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-136'/>
-    <typedef-decl name='gzFile' type-id='type-id-137' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-138'/>
-    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-139'>
+    <type-decl name='variadic parameter type' id='type-id-131'/>
+    <typedef-decl name='gzFile' type-id='type-id-132' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-133'/>
+    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1232,64 +1182,64 @@
         <var-decl name='pos' type-id='type-id-9' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-135'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-44' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-16' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-9' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-16' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-140' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-135' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/arm-linux-gnueabi/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1319,15 +1269,15 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='__va_list' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-141'>
+    <class-decl name='__va_list' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__ap' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-141' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='40' column='1' id='type-id-142'/>
-    <typedef-decl name='va_list' type-id='type-id-142' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='99' column='1' id='type-id-143'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-136' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='40' column='1' id='type-id-137'/>
+    <typedef-decl name='va_list' type-id='type-id-137' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='99' column='1' id='type-id-138'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-16'/>
@@ -1336,38 +1286,38 @@
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-44' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-143' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-138' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-16' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-16'/>
@@ -1376,20 +1326,20 @@
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-139'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='61568' id='type-id-146'>
-      <subrange length='1924' type-id='type-id-3' id='type-id-147'/>
+    <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='61568' id='type-id-141'>
+      <subrange length='1924' type-id='type-id-3' id='type-id-142'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-148'>
-      <subrange length='288' type-id='type-id-3' id='type-id-149'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-143'>
+      <subrange length='288' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-150'>
-      <subrange length='320' type-id='type-id-3' id='type-id-151'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-145'>
+      <subrange length='320' type-id='type-id-3' id='type-id-146'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-153'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-147' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-148'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1424,13 +1374,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-152'/>
-    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-154'>
+    <typedef-decl name='inflate_mode' type-id='type-id-148' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-147'/>
+    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-14' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='last' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1490,10 +1440,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='lencode' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='distcode' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1514,16 +1464,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='next' type-id='type-id-156' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-151' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='lens' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='work' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11232'>
-        <var-decl name='codes' type-id='type-id-146' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-141' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72800'>
         <var-decl name='sane' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1538,7 +1488,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-157'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1549,209 +1499,205 @@
         <var-decl name='val' type-id='type-id-65' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-145'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-158' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-159'>
+    <typedef-decl name='code' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-140'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-154'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-158'/>
-    <typedef-decl name='in_func' type-id='type-id-160' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-161'/>
-    <typedef-decl name='out_func' type-id='type-id-162' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='32' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='32' id='type-id-164'/>
-    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='32' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='32' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='32' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='32' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-170'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-153'/>
+    <typedef-decl name='in_func' type-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-156'/>
+    <typedef-decl name='out_func' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='32' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='32' id='type-id-159'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='32' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='32' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='32' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='32' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-166'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-161' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-163' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-156' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-158' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-162'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-165'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-164'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-165'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-type size-in-bits='32' id='type-id-168'>
+    <function-type size-in-bits='32' id='type-id-163'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-169'>
+    <function-type size-in-bits='32' id='type-id-164'>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-161'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='long int' size-in-bits='32' id='type-id-171'/>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <type-decl name='long int' size-in-bits='32' id='type-id-167'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
-      <return type-id='type-id-171'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
+      <return type-id='type-id-167'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='9216' id='type-id-173'>
-      <subrange length='288' type-id='type-id-3' id='type-id-149'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='9216' id='type-id-169'>
+      <subrange length='288' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-174'>
-      <subrange length='30' type-id='type-id-3' id='type-id-175'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-170'>
+      <subrange length='30' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='928' id='type-id-177'>
-      <subrange length='29' type-id='type-id-3' id='type-id-178'/>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='928' id='type-id-173'>
+      <subrange length='29' type-id='type-id-3' id='type-id-174'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='960' id='type-id-179'>
-      <subrange length='30' type-id='type-id-3' id='type-id-175'/>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-175'>
+      <subrange length='30' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-180'>
-      <subrange length='256' type-id='type-id-3' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-176'>
+      <subrange length='256' type-id='type-id-3' id='type-id-177'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-182'>
-      <subrange length='512' type-id='type-id-3' id='type-id-183'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-178'>
+      <subrange length='512' type-id='type-id-3' id='type-id-179'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-172'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-176'/>
-    <var-decl name='static_ltree' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-182' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-180' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-179' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-168'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-172'/>
+    <var-decl name='static_ltree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1770,16 +1716,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-184' size-in-bits='320' id='type-id-185'>
-      <subrange length='10' type-id='type-id-3' id='type-id-186'/>
+    <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='320' id='type-id-181'>
+      <subrange length='10' type-id='type-id-3' id='type-id-182'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-187'>
-      <subrange length='38' type-id='type-id-3' id='type-id-188'/>
+    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-183'>
+      <subrange length='38' type-id='type-id-3' id='type-id-184'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-189'/>
-    <var-decl name='zlibng_string' type-id='type-id-187' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-185'/>
+    <var-decl name='zng_vstring' type-id='type-id-183' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1789,13 +1735,13 @@
       <parameter type-id='type-id-16' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-185' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/arm-linux-gnueabi/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/arm-linux-gnueabi/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-16'/>
@@ -1808,9 +1754,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-190' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-191'>
+    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-186' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-134' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mode' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1873,44 +1819,44 @@
         <var-decl name='strm' type-id='type-id-47' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-191' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-190'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='194' column='1' id='type-id-192'/>
-    <typedef-decl name='ssize_t' type-id='type-id-192' filepath='/usr/arm-linux-gnueabi/include/stdio.h' line='77' column='1' id='type-id-144'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='32' id='type-id-193'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-187' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-186'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='194' column='1' id='type-id-188'/>
+    <typedef-decl name='ssize_t' type-id='type-id-188' filepath='/usr/arm-linux-gnueabi/include/stdio.h' line='77' column='1' id='type-id-139'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='32' id='type-id-189'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-189'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-4'/>
@@ -1920,10 +1866,10 @@
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-139'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/arm-linux-gnueabi/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <return type-id='type-id-140'/>
+      <return type-id='type-id-135'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/arm-linux-gnueabi/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabihf.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabihf.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabihf.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabihf.abi
index b3f30ff3..f5b3aa77 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-arm-unknown-linux-gnueabihf.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-arm-unknown-linux-gnueabihf.abi
@@ -4,9 +4,7 @@
     <dependency name='ld-linux-armhf.so.3'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_neon' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='crc32_acle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long long int' size-in-bits='64' id='type-id-1'/>
@@ -778,21 +776,21 @@
       <parameter type-id='type-id-31' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -814,13 +812,13 @@
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
@@ -884,81 +882,72 @@
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-23' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-105'/>
-    <class-decl name='functable_s' size-in-bits='608' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-106'>
+    <class-decl name='functable_s' size-in-bits='544' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-106'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='chunkcopy' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='chunkunroll' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='chunkmemset' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='longest_match' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='longest_match_slow' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='slide_hash' type-id='type-id-119' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='32' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='32' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='32' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='32' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-115'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-43'/>
@@ -972,7 +961,7 @@
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='adler32_neon' mangled-name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='adler32_neon'>
+    <function-decl name='adler32_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='30' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
@@ -981,239 +970,200 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='99' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunksize_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='89' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='100' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='101' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='102' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='103' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='90' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='115' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='crc32_acle' mangled-name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_acle'>
+    <function-decl name='crc32_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='126' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='132' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='140' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='157' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='165' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='longest_match_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='165' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='173' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='178' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='186' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='188' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='196' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='200' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='208' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='219' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='220' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_neon' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='228' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='237' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_acle' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='245' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='32' id='type-id-120'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-121'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-122'>
+      <parameter type-id='type-id-119'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-123'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-124'>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-125'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-126'>
+    <function-type size-in-bits='32' id='type-id-124'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='32' id='type-id-125'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-126'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-127'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-128'>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-129'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-95'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-130'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-131'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-133'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-134'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-4'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-135'>
-      <parameter type-id='type-id-95'/>
-      <return type-id='type-id-4'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-136'/>
-    <typedef-decl name='gzFile' type-id='type-id-137' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-138'/>
-    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-139'>
+    <type-decl name='variadic parameter type' id='type-id-131'/>
+    <typedef-decl name='gzFile' type-id='type-id-132' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-133'/>
+    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1224,64 +1174,64 @@
         <var-decl name='pos' type-id='type-id-9' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-135'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-44' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-16' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-9' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-16' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-140' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-135' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/arm-linux-gnueabihf/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1311,15 +1261,15 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='__va_list' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-141'>
+    <class-decl name='__va_list' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__ap' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-141' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='40' column='1' id='type-id-142'/>
-    <typedef-decl name='va_list' type-id='type-id-142' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='99' column='1' id='type-id-143'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-136' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='40' column='1' id='type-id-137'/>
+    <typedef-decl name='va_list' type-id='type-id-137' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='99' column='1' id='type-id-138'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-16'/>
@@ -1328,38 +1278,38 @@
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-44' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-143' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-138' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-16' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-16'/>
@@ -1368,20 +1318,20 @@
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-139'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='61568' id='type-id-146'>
-      <subrange length='1924' type-id='type-id-3' id='type-id-147'/>
+    <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='61568' id='type-id-141'>
+      <subrange length='1924' type-id='type-id-3' id='type-id-142'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-148'>
-      <subrange length='288' type-id='type-id-3' id='type-id-149'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-143'>
+      <subrange length='288' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-150'>
-      <subrange length='320' type-id='type-id-3' id='type-id-151'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-145'>
+      <subrange length='320' type-id='type-id-3' id='type-id-146'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-153'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-147' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-148'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1416,13 +1366,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-152'/>
-    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-154'>
+    <typedef-decl name='inflate_mode' type-id='type-id-148' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-147'/>
+    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-14' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='last' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1482,10 +1432,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='lencode' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='distcode' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1506,16 +1456,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='next' type-id='type-id-156' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-151' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='lens' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='work' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11232'>
-        <var-decl name='codes' type-id='type-id-146' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-141' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72800'>
         <var-decl name='sane' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1530,7 +1480,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-157'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1541,209 +1491,205 @@
         <var-decl name='val' type-id='type-id-65' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-145'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-158' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-159'>
+    <typedef-decl name='code' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-140'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-154'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-158'/>
-    <typedef-decl name='in_func' type-id='type-id-160' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-161'/>
-    <typedef-decl name='out_func' type-id='type-id-162' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='32' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='32' id='type-id-164'/>
-    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='32' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='32' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='32' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='32' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-170'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-153'/>
+    <typedef-decl name='in_func' type-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-156'/>
+    <typedef-decl name='out_func' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='32' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='32' id='type-id-159'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='32' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='32' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='32' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='32' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-166'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-161' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-163' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-156' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-158' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-162'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-165'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-164'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-165'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-type size-in-bits='32' id='type-id-168'>
+    <function-type size-in-bits='32' id='type-id-163'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-169'>
+    <function-type size-in-bits='32' id='type-id-164'>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-161'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='long int' size-in-bits='32' id='type-id-171'/>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <type-decl name='long int' size-in-bits='32' id='type-id-167'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
-      <return type-id='type-id-171'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
+      <return type-id='type-id-167'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='9216' id='type-id-173'>
-      <subrange length='288' type-id='type-id-3' id='type-id-149'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='9216' id='type-id-169'>
+      <subrange length='288' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-174'>
-      <subrange length='30' type-id='type-id-3' id='type-id-175'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-170'>
+      <subrange length='30' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='928' id='type-id-177'>
-      <subrange length='29' type-id='type-id-3' id='type-id-178'/>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='928' id='type-id-173'>
+      <subrange length='29' type-id='type-id-3' id='type-id-174'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='960' id='type-id-179'>
-      <subrange length='30' type-id='type-id-3' id='type-id-175'/>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-175'>
+      <subrange length='30' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-180'>
-      <subrange length='256' type-id='type-id-3' id='type-id-181'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-176'>
+      <subrange length='256' type-id='type-id-3' id='type-id-177'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-182'>
-      <subrange length='512' type-id='type-id-3' id='type-id-183'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-178'>
+      <subrange length='512' type-id='type-id-3' id='type-id-179'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-172'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-176'/>
-    <var-decl name='static_ltree' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-182' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-180' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-179' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-168'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-172'/>
+    <var-decl name='static_ltree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1762,16 +1708,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-184' size-in-bits='320' id='type-id-185'>
-      <subrange length='10' type-id='type-id-3' id='type-id-186'/>
+    <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='320' id='type-id-181'>
+      <subrange length='10' type-id='type-id-3' id='type-id-182'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-187'>
-      <subrange length='38' type-id='type-id-3' id='type-id-188'/>
+    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-183'>
+      <subrange length='38' type-id='type-id-3' id='type-id-184'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-189'/>
-    <var-decl name='zlibng_string' type-id='type-id-187' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-185'/>
+    <var-decl name='zng_vstring' type-id='type-id-183' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1781,13 +1727,13 @@
       <parameter type-id='type-id-16' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-185' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/arm-linux-gnueabihf/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/arm-linux-gnueabihf/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-16'/>
@@ -1800,9 +1746,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-190' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-191'>
+    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-186' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-134' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mode' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1865,44 +1811,44 @@
         <var-decl name='strm' type-id='type-id-47' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-191' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-190'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='194' column='1' id='type-id-192'/>
-    <typedef-decl name='ssize_t' type-id='type-id-192' filepath='/usr/arm-linux-gnueabihf/include/stdio.h' line='77' column='1' id='type-id-144'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='32' id='type-id-193'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-187' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-186'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='194' column='1' id='type-id-188'/>
+    <typedef-decl name='ssize_t' type-id='type-id-188' filepath='/usr/arm-linux-gnueabihf/include/stdio.h' line='77' column='1' id='type-id-139'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='32' id='type-id-189'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-189'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-4'/>
@@ -1912,10 +1858,10 @@
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-139'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/arm-linux-gnueabihf/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <return type-id='type-id-140'/>
+      <return type-id='type-id-135'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/arm-linux-gnueabihf/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc-unknown-linux-gnu.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc-unknown-linux-gnu.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc-unknown-linux-gnu.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc-unknown-linux-gnu.abi
index 81bda0d8..3164f07e 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc-unknown-linux-gnu.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc-unknown-linux-gnu.abi
@@ -4,9 +4,7 @@
     <dependency name='ld.so.1'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_power8' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_vmx' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long long int' size-in-bits='64' id='type-id-1'/>
@@ -778,21 +776,21 @@
       <parameter type-id='type-id-31' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -814,13 +812,13 @@
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
@@ -892,81 +890,72 @@
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-23' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-105'/>
-    <class-decl name='functable_s' size-in-bits='608' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-106'>
+    <class-decl name='functable_s' size-in-bits='544' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-106'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='chunkcopy' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='chunkunroll' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='chunkmemset' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='longest_match' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='longest_match_slow' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='slide_hash' type-id='type-id-119' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='32' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='32' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='32' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='32' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-115'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-43'/>
@@ -980,13 +969,13 @@
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='adler32_vmx' mangled-name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='adler32_vmx'>
+    <function-decl name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='adler32_power8' mangled-name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='adler32_power8'>
+    <function-decl name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
@@ -995,225 +984,186 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='106' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='93' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='107' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='108' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='109' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='110' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='94' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='128' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='136' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='148' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='156' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='169' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='181' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='189' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='185' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='193' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='203' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='223' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='231' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='226' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='234' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='32' id='type-id-120'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-121'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-122'>
+      <parameter type-id='type-id-119'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-123'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-124'>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-125'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-126'>
+    <function-type size-in-bits='32' id='type-id-124'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='32' id='type-id-125'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-126'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-127'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-128'>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-129'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-95'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-130'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-131'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-133'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-134'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-4'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-135'>
-      <parameter type-id='type-id-95'/>
-      <return type-id='type-id-4'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-136'/>
-    <typedef-decl name='gzFile' type-id='type-id-137' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-138'/>
-    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-139'>
+    <type-decl name='variadic parameter type' id='type-id-131'/>
+    <typedef-decl name='gzFile' type-id='type-id-132' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-133'/>
+    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1224,64 +1174,64 @@
         <var-decl name='pos' type-id='type-id-9' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-135'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-44' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-16' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-9' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-16' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-140' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-135' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/powerpc-linux-gnu/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1311,7 +1261,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='__va_list_tag' size-in-bits='96' is-struct='yes' visibility='default' id='type-id-141'>
+    <class-decl name='__va_list_tag' size-in-bits='96' is-struct='yes' visibility='default' id='type-id-136'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='gpr' type-id='type-id-2' visibility='default'/>
       </data-member>
@@ -1328,9 +1278,9 @@
         <var-decl name='reg_save_area' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-141' size-in-bits='32' id='type-id-142'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='32' id='type-id-137'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-16'/>
@@ -1339,38 +1289,38 @@
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-44' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-142' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-137' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-16' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-16'/>
@@ -1379,20 +1329,20 @@
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-143'/>
+      <return type-id='type-id-138'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='61568' id='type-id-145'>
-      <subrange length='1924' type-id='type-id-3' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='61568' id='type-id-140'>
+      <subrange length='1924' type-id='type-id-3' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-147'>
-      <subrange length='288' type-id='type-id-3' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-142'>
+      <subrange length='288' type-id='type-id-3' id='type-id-143'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-149'>
-      <subrange length='320' type-id='type-id-3' id='type-id-150'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-144'>
+      <subrange length='320' type-id='type-id-3' id='type-id-145'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-152'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-146' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-147'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1427,13 +1377,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-151'/>
-    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-153'>
+    <typedef-decl name='inflate_mode' type-id='type-id-147' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-146'/>
+    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-148'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-14' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mode' type-id='type-id-151' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-146' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='last' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1493,10 +1443,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='lencode' type-id='type-id-154' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='distcode' type-id='type-id-154' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1517,16 +1467,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='next' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='lens' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='work' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11232'>
-        <var-decl name='codes' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72800'>
         <var-decl name='sane' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1541,7 +1491,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-156'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-151'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1552,209 +1502,205 @@
         <var-decl name='val' type-id='type-id-65' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-144'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-158'>
+    <typedef-decl name='code' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-139'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-153'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-158' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-157'/>
-    <typedef-decl name='in_func' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-160'/>
-    <typedef-decl name='out_func' type-id='type-id-161' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-144' size-in-bits='32' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-155' size-in-bits='32' id='type-id-163'/>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='32' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='32' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='32' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='32' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-169'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-152'/>
+    <typedef-decl name='in_func' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-155'/>
+    <typedef-decl name='out_func' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='32' id='type-id-158'/>
+    <qualified-type-def type-id='type-id-139' const='yes' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-159' size-in-bits='32' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-148' size-in-bits='32' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='32' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='32' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-165'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-160' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-162' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-155' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-157' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-161'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-157'/>
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-152'/>
+      <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-163'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-164'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-type size-in-bits='32' id='type-id-167'>
+    <function-type size-in-bits='32' id='type-id-162'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-168'>
+    <function-type size-in-bits='32' id='type-id-163'>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-160'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='long int' size-in-bits='32' id='type-id-170'/>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <type-decl name='long int' size-in-bits='32' id='type-id-166'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
-      <return type-id='type-id-170'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
+      <return type-id='type-id-166'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='9216' id='type-id-172'>
-      <subrange length='288' type-id='type-id-3' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='9216' id='type-id-168'>
+      <subrange length='288' type-id='type-id-3' id='type-id-143'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='960' id='type-id-173'>
-      <subrange length='30' type-id='type-id-3' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='960' id='type-id-169'>
+      <subrange length='30' type-id='type-id-3' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-175' size-in-bits='928' id='type-id-176'>
-      <subrange length='29' type-id='type-id-3' id='type-id-177'/>
+    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='928' id='type-id-172'>
+      <subrange length='29' type-id='type-id-3' id='type-id-173'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-175' size-in-bits='960' id='type-id-178'>
-      <subrange length='30' type-id='type-id-3' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='960' id='type-id-174'>
+      <subrange length='30' type-id='type-id-3' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-179'>
-      <subrange length='256' type-id='type-id-3' id='type-id-180'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-175'>
+      <subrange length='256' type-id='type-id-3' id='type-id-176'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-181'>
-      <subrange length='512' type-id='type-id-3' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-177'>
+      <subrange length='512' type-id='type-id-3' id='type-id-178'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-171'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-175'/>
-    <var-decl name='static_ltree' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-179' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-167'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-171'/>
+    <var-decl name='static_ltree' type-id='type-id-168' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1773,16 +1719,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='320' id='type-id-184'>
-      <subrange length='10' type-id='type-id-3' id='type-id-185'/>
+    <array-type-def dimensions='1' type-id='type-id-179' size-in-bits='320' id='type-id-180'>
+      <subrange length='10' type-id='type-id-3' id='type-id-181'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-186'>
-      <subrange length='38' type-id='type-id-3' id='type-id-187'/>
+    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-182'>
+      <subrange length='38' type-id='type-id-3' id='type-id-183'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-183'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-188'/>
-    <var-decl name='zlibng_string' type-id='type-id-186' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-184'/>
+    <var-decl name='zng_vstring' type-id='type-id-182' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1792,13 +1738,13 @@
       <parameter type-id='type-id-16' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-184' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-180' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/powerpc-linux-gnu/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/powerpc-linux-gnu/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-184'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-16'/>
@@ -1814,9 +1760,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-189' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-190'>
+    <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-185' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-134' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mode' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1879,44 +1825,44 @@
         <var-decl name='strm' type-id='type-id-47' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-190' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-189'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/powerpc-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-191'/>
-    <typedef-decl name='ssize_t' type-id='type-id-191' filepath='/usr/powerpc-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-189' size-in-bits='32' id='type-id-192'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-186' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-185'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/powerpc-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-187'/>
+    <typedef-decl name='ssize_t' type-id='type-id-187' filepath='/usr/powerpc-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='32' id='type-id-188'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-192'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-4'/>
@@ -1926,10 +1872,10 @@
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-143'/>
+      <return type-id='type-id-138'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/powerpc-linux-gnu/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <return type-id='type-id-140'/>
+      <return type-id='type-id-135'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/powerpc-linux-gnu/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64-unknown-linux-gnu.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64-unknown-linux-gnu.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64-unknown-linux-gnu.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64-unknown-linux-gnu.abi
index 4ca3102e..1d97902b 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64-unknown-linux-gnu.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64-unknown-linux-gnu.abi
@@ -4,9 +4,7 @@
     <dependency name='ld64.so.1'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_power8' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_vmx' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long int' size-in-bits='64' id='type-id-1'/>
@@ -788,21 +786,21 @@
       <parameter type-id='type-id-4' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -824,13 +822,13 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
@@ -902,81 +900,72 @@
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-24' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-103'/>
-    <class-decl name='functable_s' size-in-bits='1216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-104'>
+    <class-decl name='functable_s' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='chunkcopy' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='chunkunroll' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='chunkmemset' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-113'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-42'/>
@@ -990,13 +979,13 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='adler32_vmx' mangled-name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_vmx'>
+    <function-decl name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='adler32_power8' mangled-name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_power8'>
+    <function-decl name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
@@ -1005,231 +994,192 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='chunkcopy_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='inflate_fast_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='crc32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='crc32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <return type-id='type-id-8'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-119'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-8'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-117'/>
       <return type-id='type-id-8'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-8'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
-      <parameter type-id='type-id-119'/>
-      <return type-id='type-id-8'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-123'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-123'>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-8'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-125'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-126'>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-127'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-128'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-131'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-132'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-6'/>
-      <return type-id='type-id-5'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-133'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-5'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-134'/>
-    <typedef-decl name='gzFile' type-id='type-id-135' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-136'/>
-    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-137'>
+    <type-decl name='variadic parameter type' id='type-id-129'/>
+    <typedef-decl name='gzFile' type-id='type-id-130' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-131'/>
+    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1240,64 +1190,64 @@
         <var-decl name='pos' type-id='type-id-10' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-133'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-43' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-17' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-10' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-17' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-138' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/powerpc64-linux-gnu/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1327,10 +1277,10 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-139'/>
-    <typedef-decl name='va_list' type-id='type-id-139' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-140'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-134'/>
+    <typedef-decl name='va_list' type-id='type-id-134' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-135'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-17'/>
@@ -1339,38 +1289,38 @@
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-43' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-140' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-135' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-17' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-17'/>
@@ -1379,20 +1329,20 @@
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='61568' id='type-id-143'>
-      <subrange length='1924' type-id='type-id-4' id='type-id-144'/>
+    <array-type-def dimensions='1' type-id='type-id-137' size-in-bits='61568' id='type-id-138'>
+      <subrange length='1924' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-145'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-140'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-147'>
-      <subrange length='320' type-id='type-id-4' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-142'>
+      <subrange length='320' type-id='type-id-4' id='type-id-143'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-150'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-144' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-145'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1427,13 +1377,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-149'/>
-    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-151'>
+    <typedef-decl name='inflate_mode' type-id='type-id-145' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-144'/>
+    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-146'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-15' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='last' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1493,10 +1443,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='lencode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='distcode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1517,16 +1467,16 @@
         <var-decl name='have' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='next' type-id='type-id-153' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='lens' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='work' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11456'>
-        <var-decl name='codes' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-138' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='73024'>
         <var-decl name='sane' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1541,7 +1491,7 @@
         <var-decl name='chunksize' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-154'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1552,208 +1502,204 @@
         <var-decl name='val' type-id='type-id-63' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-142'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-156'>
+    <typedef-decl name='code' type-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-137'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-155'/>
-    <typedef-decl name='in_func' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-158'/>
-    <typedef-decl name='out_func' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-161'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-167'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-150'/>
+    <typedef-decl name='in_func' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-153'/>
+    <typedef-decl name='out_func' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-156'/>
+    <qualified-type-def type-id='type-id-137' const='yes' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-163'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-158' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-160' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-153' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-155' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-4'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-159'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-155'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-150'/>
+      <parameter type-id='type-id-162'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-156'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-162'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-165'>
+    <function-type size-in-bits='64' id='type-id-160'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-166'>
+    <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-158'/>
       <return type-id='type-id-8'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='9216' id='type-id-169'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='9216' id='type-id-165'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-170'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='960' id='type-id-166'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='928' id='type-id-173'>
-      <subrange length='29' type-id='type-id-4' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='928' id='type-id-169'>
+      <subrange length='29' type-id='type-id-4' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-175'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-171'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='2048' id='type-id-176'>
-      <subrange length='256' type-id='type-id-4' id='type-id-177'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='2048' id='type-id-172'>
+      <subrange length='256' type-id='type-id-4' id='type-id-173'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='4096' id='type-id-178'>
-      <subrange length='512' type-id='type-id-4' id='type-id-179'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='4096' id='type-id-174'>
+      <subrange length='512' type-id='type-id-4' id='type-id-175'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-168'/>
-    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-172'/>
-    <var-decl name='static_ltree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-164'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-168'/>
+    <var-decl name='static_ltree' type-id='type-id-165' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-166' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-171' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1772,16 +1718,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='640' id='type-id-181'>
-      <subrange length='10' type-id='type-id-4' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='640' id='type-id-177'>
+      <subrange length='10' type-id='type-id-4' id='type-id-178'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-183'>
-      <subrange length='38' type-id='type-id-4' id='type-id-184'/>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-179'>
+      <subrange length='38' type-id='type-id-4' id='type-id-180'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-185'/>
-    <var-decl name='zlibng_string' type-id='type-id-183' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-181'/>
+    <var-decl name='zng_vstring' type-id='type-id-179' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1791,13 +1737,13 @@
       <parameter type-id='type-id-17' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/powerpc64-linux-gnu/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/powerpc64-linux-gnu/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-181'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-17'/>
@@ -1813,9 +1759,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-186' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-187'>
+    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-182' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-132' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='mode' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1878,44 +1824,44 @@
         <var-decl name='strm' type-id='type-id-46' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-187' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-186'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-188'/>
-    <typedef-decl name='ssize_t' type-id='type-id-188' filepath='/usr/powerpc64-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-189'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-183' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-182'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-184'/>
+    <typedef-decl name='ssize_t' type-id='type-id-184' filepath='/usr/powerpc64-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-136'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-185'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-5'/>
@@ -1925,10 +1871,10 @@
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/powerpc64-linux-gnu/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/powerpc64-linux-gnu/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64le-unknown-linux-gnu.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64le-unknown-linux-gnu.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64le-unknown-linux-gnu.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64le-unknown-linux-gnu.abi
index 2862e2a5..613f5f2f 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-powerpc64le-unknown-linux-gnu.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-powerpc64le-unknown-linux-gnu.abi
@@ -4,9 +4,7 @@
     <dependency name='ld64.so.2'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='adler32_power8' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='adler32_vmx' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -95,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long int' size-in-bits='64' id='type-id-1'/>
@@ -788,21 +786,21 @@
       <parameter type-id='type-id-4' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-6' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -824,13 +822,13 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
@@ -894,81 +892,72 @@
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-24' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-103'/>
-    <class-decl name='functable_s' size-in-bits='1216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-104'>
+    <class-decl name='functable_s' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='chunkcopy' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='chunkunroll' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='chunkmemset' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-113'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-42'/>
@@ -982,13 +971,13 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='adler32_vmx' mangled-name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_vmx'>
+    <function-decl name='adler32_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='adler32_power8' mangled-name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adler32_power8'>
+    <function-decl name='adler32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
@@ -997,231 +986,192 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunksize_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='chunkcopy_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='inflate_fast_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='crc32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='crc32_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_power9' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_vmx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_power8' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <return type-id='type-id-8'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-119'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-8'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-117'/>
       <return type-id='type-id-8'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-8'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
-      <parameter type-id='type-id-119'/>
-      <return type-id='type-id-8'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-123'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-8'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-8'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-123'>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-8'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-125'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-126'>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-127'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-128'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-131'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-132'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-6'/>
-      <return type-id='type-id-5'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-133'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-5'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-134'/>
-    <typedef-decl name='gzFile' type-id='type-id-135' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-136'/>
-    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-137'>
+    <type-decl name='variadic parameter type' id='type-id-129'/>
+    <typedef-decl name='gzFile' type-id='type-id-130' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-131'/>
+    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1232,64 +1182,64 @@
         <var-decl name='pos' type-id='type-id-10' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-133'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-43' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-17' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-10' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-17' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-138' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/powerpc64le-linux-gnu/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1319,10 +1269,10 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-139'/>
-    <typedef-decl name='va_list' type-id='type-id-139' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-140'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-134'/>
+    <typedef-decl name='va_list' type-id='type-id-134' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-135'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-17'/>
@@ -1331,38 +1281,38 @@
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-43' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-140' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-135' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-17' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-17'/>
@@ -1371,20 +1321,20 @@
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='61568' id='type-id-143'>
-      <subrange length='1924' type-id='type-id-4' id='type-id-144'/>
+    <array-type-def dimensions='1' type-id='type-id-137' size-in-bits='61568' id='type-id-138'>
+      <subrange length='1924' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-145'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-140'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-147'>
-      <subrange length='320' type-id='type-id-4' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-142'>
+      <subrange length='320' type-id='type-id-4' id='type-id-143'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-150'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-144' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-145'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1419,13 +1369,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-149'/>
-    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-151'>
+    <typedef-decl name='inflate_mode' type-id='type-id-145' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-144'/>
+    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-146'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-15' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='last' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1485,10 +1435,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='lencode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='distcode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1509,16 +1459,16 @@
         <var-decl name='have' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='next' type-id='type-id-153' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='lens' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='work' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11456'>
-        <var-decl name='codes' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-138' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='73024'>
         <var-decl name='sane' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1533,7 +1483,7 @@
         <var-decl name='chunksize' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-154'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1544,208 +1494,204 @@
         <var-decl name='val' type-id='type-id-63' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-142'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-156'>
+    <typedef-decl name='code' type-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-137'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-155'/>
-    <typedef-decl name='in_func' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-158'/>
-    <typedef-decl name='out_func' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-161'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-167'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-150'/>
+    <typedef-decl name='in_func' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-153'/>
+    <typedef-decl name='out_func' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-156'/>
+    <qualified-type-def type-id='type-id-137' const='yes' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-163'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-158' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-160' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-153' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-155' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-4'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-159'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-155'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-150'/>
+      <parameter type-id='type-id-162'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-156'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-162'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-165'>
+    <function-type size-in-bits='64' id='type-id-160'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-166'>
+    <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-158'/>
       <return type-id='type-id-8'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='9216' id='type-id-169'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='9216' id='type-id-165'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-170'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='960' id='type-id-166'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='928' id='type-id-173'>
-      <subrange length='29' type-id='type-id-4' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='928' id='type-id-169'>
+      <subrange length='29' type-id='type-id-4' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-175'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-171'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='2048' id='type-id-176'>
-      <subrange length='256' type-id='type-id-4' id='type-id-177'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='2048' id='type-id-172'>
+      <subrange length='256' type-id='type-id-4' id='type-id-173'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='4096' id='type-id-178'>
-      <subrange length='512' type-id='type-id-4' id='type-id-179'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='4096' id='type-id-174'>
+      <subrange length='512' type-id='type-id-4' id='type-id-175'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-168'/>
-    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-172'/>
-    <var-decl name='static_ltree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-164'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-168'/>
+    <var-decl name='static_ltree' type-id='type-id-165' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-166' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-171' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1764,16 +1710,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='640' id='type-id-181'>
-      <subrange length='10' type-id='type-id-4' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='640' id='type-id-177'>
+      <subrange length='10' type-id='type-id-4' id='type-id-178'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-183'>
-      <subrange length='38' type-id='type-id-4' id='type-id-184'/>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-179'>
+      <subrange length='38' type-id='type-id-4' id='type-id-180'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-185'/>
-    <var-decl name='zlibng_string' type-id='type-id-183' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-181'/>
+    <var-decl name='zng_vstring' type-id='type-id-179' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1783,13 +1729,13 @@
       <parameter type-id='type-id-17' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/powerpc64le-linux-gnu/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/powerpc64le-linux-gnu/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-181'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-17'/>
@@ -1805,9 +1751,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-186' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-187'>
+    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-182' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-132' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='mode' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -1870,44 +1816,44 @@
         <var-decl name='strm' type-id='type-id-46' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-187' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-186'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64le-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-188'/>
-    <typedef-decl name='ssize_t' type-id='type-id-188' filepath='/usr/powerpc64le-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-189'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-183' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-182'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64le-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-184'/>
+    <typedef-decl name='ssize_t' type-id='type-id-184' filepath='/usr/powerpc64le-linux-gnu/include/stdio.h' line='77' column='1' id='type-id-136'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-185'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-5'/>
@@ -1917,10 +1863,10 @@
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/powerpc64le-linux-gnu/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/powerpc64le-linux-gnu/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu-m32.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu-m32.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu-m32.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu-m32.abi
index aac9172f..82d8943b 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu-m32.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu-m32.abi
@@ -4,7 +4,7 @@
     <dependency name='ld-linux.so.2'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -93,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long long int' size-in-bits='64' id='type-id-1'/>
@@ -428,7 +428,7 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='x86_check_features' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/x86_features.h' line='22' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='x86_check_features' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/x86_features.h' line='21' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
@@ -776,21 +776,21 @@
       <parameter type-id='type-id-31' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-104' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-42' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -812,13 +812,13 @@
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
@@ -882,81 +882,72 @@
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-23' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-105'/>
-    <class-decl name='functable_s' size-in-bits='608' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-106'>
+    <class-decl name='functable_s' size-in-bits='544' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-106'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='chunkcopy' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='chunkunroll' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='chunkmemset' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='insert_string' type-id='type-id-79' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='longest_match' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='longest_match_slow' type-id='type-id-118' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='quick_insert_string' type-id='type-id-80' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='slide_hash' type-id='type-id-119' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='32' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='32' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='32' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='32' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='32' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='32' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='32' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='32' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='32' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='32' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='32' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='32' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='32' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='32' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='32' id='type-id-115'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-43'/>
@@ -1023,25 +1014,25 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_reset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='67' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_copy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='68' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='69' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_final' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='70' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_pclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='71' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1053,298 +1044,245 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunksize_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='81' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunksize_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='82' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='83' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='84' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='85' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunkmemset_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='88' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='89' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='82' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='chunksize_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='92' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunksize_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='85' column='1' visibility='default' binding='global' size-in-bits='32'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='93' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkunroll_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='94' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='95' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='96' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='chunkmemset_safe_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='86' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='106' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='109' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='inflate_fast_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='112' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='132' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='140' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='139' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='147' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='142' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='compare256_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='150' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='155' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='163' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='longest_match_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='165' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='173' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='172' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='180' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='175' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='183' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='188' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_unaligned_32' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='196' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='194' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='202' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='197' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='longest_match_slow_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='205' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='quick_insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='209' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='quick_insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='217' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-19'/>
     </function-decl>
-    <function-decl name='slide_hash_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='218' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='226' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='slide_hash_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='229' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='slide_hash_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='237' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='update_hash_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='235' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='update_hash_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='243' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-120'/>
+      <parameter type-id='type-id-118'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-95'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='32' id='type-id-120'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-121'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-122'>
+      <parameter type-id='type-id-119'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-123'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-124'>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-125'>
       <parameter type-id='type-id-96'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-126'>
+    <function-type size-in-bits='32' id='type-id-124'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='32' id='type-id-125'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='32' id='type-id-126'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-type>
     <function-type size-in-bits='32' id='type-id-127'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-128'>
+      <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-129'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-132'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-95'/>
+      <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='32' id='type-id-130'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-131'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-43'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-133'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-134'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-4'/>
-    </function-type>
-    <function-type size-in-bits='32' id='type-id-135'>
-      <parameter type-id='type-id-95'/>
-      <return type-id='type-id-4'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-136'/>
-    <typedef-decl name='gzFile' type-id='type-id-137' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-138'/>
-    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-139'>
+    <type-decl name='variadic parameter type' id='type-id-131'/>
+    <typedef-decl name='gzFile' type-id='type-id-132' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-133'/>
+    <class-decl name='gzFile_s' size-in-bits='128' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1355,64 +1293,64 @@
         <var-decl name='pos' type-id='type-id-9' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='32' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='32' id='type-id-135'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-44' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-16' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-44' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-9' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-16' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-140' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-135' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138'/>
+      <parameter type-id='type-id-133'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='__open_2' filepath='/usr/include/bits/fcntl2.h' line='26' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1442,10 +1380,10 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-141'/>
-    <typedef-decl name='va_list' type-id='type-id-141' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-142'/>
+    <typedef-decl name='__gnuc_va_list' type-id='type-id-32' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-136'/>
+    <typedef-decl name='va_list' type-id='type-id-136' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-137'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-16'/>
@@ -1454,38 +1392,38 @@
       <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-44' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-142' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-137' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-44' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-16' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-16' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-16'/>
@@ -1494,20 +1432,20 @@
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-143'/>
+      <return type-id='type-id-138'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='61568' id='type-id-145'>
-      <subrange length='1924' type-id='type-id-3' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='61568' id='type-id-140'>
+      <subrange length='1924' type-id='type-id-3' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-147'>
-      <subrange length='288' type-id='type-id-3' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='4608' id='type-id-142'>
+      <subrange length='288' type-id='type-id-3' id='type-id-143'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-149'>
-      <subrange length='320' type-id='type-id-3' id='type-id-150'/>
+    <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='5120' id='type-id-144'>
+      <subrange length='320' type-id='type-id-3' id='type-id-145'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-152'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-146' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-147'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1542,13 +1480,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-151'/>
-    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-153'>
+    <typedef-decl name='inflate_mode' type-id='type-id-147' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-146'/>
+    <class-decl name='inflate_state' size-in-bits='72960' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-148'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-14' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mode' type-id='type-id-151' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-146' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='last' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1608,10 +1546,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='lencode' type-id='type-id-154' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='distcode' type-id='type-id-154' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1632,16 +1570,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='next' type-id='type-id-155' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='lens' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='work' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11232'>
-        <var-decl name='codes' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72800'>
         <var-decl name='sane' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1656,7 +1594,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-156'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-151'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1667,209 +1605,205 @@
         <var-decl name='val' type-id='type-id-65' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-144'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-158'>
+    <typedef-decl name='code' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-139'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-153'>
       <underlying-type type-id='type-id-69'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-158' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-157'/>
-    <typedef-decl name='in_func' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-160'/>
-    <typedef-decl name='out_func' type-id='type-id-161' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-144' size-in-bits='32' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-155' size-in-bits='32' id='type-id-163'/>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='32' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='32' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='32' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='32' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-169'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-153' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-152'/>
+    <typedef-decl name='in_func' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-155'/>
+    <typedef-decl name='out_func' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-139' size-in-bits='32' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='32' id='type-id-158'/>
+    <qualified-type-def type-id='type-id-139' const='yes' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-159' size-in-bits='32' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='32' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-148' size-in-bits='32' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='32' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='32' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='32' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='32' id='type-id-165'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-160' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-162' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-155' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-157' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-161'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-157'/>
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-152'/>
+      <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-163'/>
-      <parameter type-id='type-id-132'/>
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-164'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-type size-in-bits='32' id='type-id-167'>
+    <function-type size-in-bits='32' id='type-id-162'>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='32' id='type-id-168'>
+    <function-type size-in-bits='32' id='type-id-163'>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-160'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='long int' size-in-bits='32' id='type-id-170'/>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <type-decl name='long int' size-in-bits='32' id='type-id-166'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-44' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-43' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-100' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-17' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-14' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
-      <return type-id='type-id-170'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
+      <return type-id='type-id-166'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-14' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='9216' id='type-id-172'>
-      <subrange length='288' type-id='type-id-3' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='9216' id='type-id-168'>
+      <subrange length='288' type-id='type-id-3' id='type-id-143'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='960' id='type-id-173'>
-      <subrange length='30' type-id='type-id-3' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='960' id='type-id-169'>
+      <subrange length='30' type-id='type-id-3' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-175' size-in-bits='928' id='type-id-176'>
-      <subrange length='29' type-id='type-id-3' id='type-id-177'/>
+    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='928' id='type-id-172'>
+      <subrange length='29' type-id='type-id-3' id='type-id-173'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-175' size-in-bits='960' id='type-id-178'>
-      <subrange length='30' type-id='type-id-3' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-171' size-in-bits='960' id='type-id-174'>
+      <subrange length='30' type-id='type-id-3' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-179'>
-      <subrange length='256' type-id='type-id-3' id='type-id-180'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-175'>
+      <subrange length='256' type-id='type-id-3' id='type-id-176'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-181'>
-      <subrange length='512' type-id='type-id-3' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-177'>
+      <subrange length='512' type-id='type-id-3' id='type-id-178'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-171'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-175'/>
-    <var-decl name='static_ltree' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-179' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-73' const='yes' id='type-id-167'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-171'/>
+    <var-decl name='static_ltree' type-id='type-id-168' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1888,16 +1822,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='320' id='type-id-184'>
-      <subrange length='10' type-id='type-id-3' id='type-id-185'/>
+    <array-type-def dimensions='1' type-id='type-id-179' size-in-bits='320' id='type-id-180'>
+      <subrange length='10' type-id='type-id-3' id='type-id-181'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-186'>
-      <subrange length='38' type-id='type-id-3' id='type-id-187'/>
+    <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='304' id='type-id-182'>
+      <subrange length='38' type-id='type-id-3' id='type-id-183'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-183'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-188'/>
-    <var-decl name='zlibng_string' type-id='type-id-186' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='32' id='type-id-184'/>
+    <var-decl name='zng_vstring' type-id='type-id-182' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1907,40 +1841,62 @@
       <parameter type-id='type-id-16' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-184' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-180' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-184'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
+  <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_avx.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
+    <function-decl name='chunkmemset_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/chunkset_tpl.h' line='9' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
+    <function-decl name='chunkcopy_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' line='88' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-43'/>
+    </function-decl>
+    <function-decl name='chunkunroll_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' line='89' column='1' visibility='default' binding='global' size-in-bits='32'>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-165'/>
+      <return type-id='type-id-43'/>
+    </function-decl>
+  </abi-instr>
   <abi-instr address-size='32' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-189'>
-      <subrange length='2' id='type-id-190'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-185'>
+      <subrange length='2' id='type-id-186'/>
     </array-type-def>
-    <typedef-decl name='__m128i' type-id='type-id-189' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/emmintrin.h' line='53' column='1' id='type-id-191'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='32' id='type-id-192'/>
+    <typedef-decl name='__m128i' type-id='type-id-185' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/emmintrin.h' line='53' column='1' id='type-id-187'/>
+    <pointer-type-def type-id='type-id-187' size-in-bits='32' id='type-id-188'/>
     <function-decl name='fold_16_vpclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' line='35' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='fold_16_vpclmulqdq_copy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' line='38' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-192'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-42'/>
@@ -1948,9 +1904,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1248' is-struct='yes' naming-typedef-id='type-id-193' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-194'>
+    <class-decl name='gz_state' size-in-bits='1248' is-struct='yes' naming-typedef-id='type-id-189' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-190'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-139' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-134' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mode' type-id='type-id-16' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -2013,44 +1969,44 @@
         <var-decl name='strm' type-id='type-id-47' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-194' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-193'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-195'/>
-    <typedef-decl name='ssize_t' type-id='type-id-195' filepath='/usr/include/stdio.h' line='77' column='1' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-193' size-in-bits='32' id='type-id-196'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-190' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-189'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-16' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-191'/>
+    <typedef-decl name='ssize_t' type-id='type-id-191' filepath='/usr/include/stdio.h' line='77' column='1' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-189' size-in-bits='32' id='type-id-192'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-46' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-42' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-16' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-16' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-138' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-133' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='type-id-196'/>
+      <parameter type-id='type-id-192'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-4'/>
@@ -2060,7 +2016,7 @@
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-143'/>
+      <return type-id='type-id-138'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-46'/>
diff --git a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu.abi b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu.abi
similarity index 87%
rename from test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu.abi
rename to test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu.abi
index 12e224db..a03df554 100644
--- a/test/abi/zlib-ng-1ab443812aceab6c80ccd573ecdd06f73a84eef4-x86_64-pc-linux-gnu.abi
+++ b/test/abi/zlib-ng-e4614ebcb9b3e5b108dc983c155e4baf80882311-x86_64-pc-linux-gnu.abi
@@ -4,7 +4,7 @@
     <dependency name='ld-linux-x86-64.so.2'/>
   </elf-needed>
   <elf-function-symbols>
-    <elf-symbol name='zlibng_version' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zlibng_version' version='ZLIB_NG_2.1.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_combine' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zng_adler32_z' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -93,7 +93,7 @@
     <elf-symbol name='zng_zlibCompileFlags' version='ZLIB_NG_2.0.0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='zlibng_string' size='38' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zng_vstring' size='38' version='ZLIB_NG_2.0.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <type-decl name='long int' size-in-bits='64' id='type-id-1'/>
@@ -435,7 +435,7 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='x86_check_features' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/x86_features.h' line='22' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='x86_check_features' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/x86_features.h' line='21' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-12'/>
     </function-decl>
   </abi-instr>
@@ -788,21 +788,21 @@
       <parameter type-id='type-id-4' name='sourceLen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='613' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1038' column='1'/>
+    <function-decl name='zng_deflateCopy' mangled-name='zng_deflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1045' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
-      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1302' column='1'/>
+    <function-decl name='zng_deflateSetParams' mangled-name='zng_deflateSetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateSetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1309' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
-      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1378' column='1'/>
+    <function-decl name='zng_deflateGetParams' mangled-name='zng_deflateGetParams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_deflateGetParams@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-102' name='params' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
+      <parameter type-id='type-id-9' name='count' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.c' line='1385' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_tr_init' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -824,13 +824,13 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='zng_calloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcalloc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zng_cfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zng_zcfree' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-12'/>
@@ -894,81 +894,72 @@
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <typedef-decl name='crc32_fold' type-id='type-id-24' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='14' column='1' id='type-id-103'/>
-    <class-decl name='functable_s' size-in-bits='1216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='13' column='1' id='type-id-104'>
+    <class-decl name='functable_s' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='14' column='1'/>
+        <var-decl name='adler32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='15' column='1'/>
+        <var-decl name='adler32_fold_copy' type-id='type-id-106' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='16' column='1'/>
+        <var-decl name='crc32' type-id='type-id-105' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='17' column='1'/>
+        <var-decl name='crc32_fold_reset' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='18' column='1'/>
+        <var-decl name='crc32_fold_copy' type-id='type-id-108' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='19' column='1'/>
+        <var-decl name='crc32_fold' type-id='type-id-109' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='20' column='1'/>
+        <var-decl name='crc32_fold_final' type-id='type-id-107' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='21' column='1'/>
+        <var-decl name='compare256' type-id='type-id-110' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='22' column='1'/>
+        <var-decl name='chunksize' type-id='type-id-111' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='chunkcopy' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='23' column='1'/>
+        <var-decl name='chunkmemset_safe' type-id='type-id-112' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='chunkunroll' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='24' column='1'/>
+        <var-decl name='inflate_fast' type-id='type-id-113' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='chunkmemset' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='25' column='1'/>
+        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='chunkmemset_safe' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='26' column='1'/>
+        <var-decl name='longest_match' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='insert_string' type-id='type-id-77' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='27' column='1'/>
+        <var-decl name='longest_match_slow' type-id='type-id-114' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='longest_match' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='28' column='1'/>
+        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='longest_match_slow' type-id='type-id-116' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='29' column='1'/>
+        <var-decl name='slide_hash' type-id='type-id-115' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='quick_insert_string' type-id='type-id-78' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='30' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='slide_hash' type-id='type-id-117' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='31' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='32' column='1'/>
+        <var-decl name='update_hash' type-id='type-id-76' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='36' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-113'/>
     <function-decl name='adler32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/adler32_fold.h' line='9' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-42'/>
@@ -1035,25 +1026,25 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_reset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_copy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_pclmulqdq_final' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_pclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1065,298 +1056,245 @@
     <function-decl name='chunksize_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunksize_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunksize_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunkmemset_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='chunksize_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunksize_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='chunkcopy_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkunroll_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-decl>
-    <function-decl name='chunkmemset_safe_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='chunkmemset_safe_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='inflate_fast_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='inflate_fast_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='inflate_fast_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='inflate_fast_avx' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
+    </function-decl>
+    <function-decl name='zng_crc32_braid' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='compare256_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='compare256_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_unaligned_64' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='longest_match_slow_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='longest_match_slow_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='quick_insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='quick_insert_string_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='slide_hash_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='slide_hash_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='slide_hash_avx2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='update_hash_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='update_hash_sse4' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/cpu_features.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_reset_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='crc32_fold_copy_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='17' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='crc32_fold_final_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/crc32_fold.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-118'/>
+      <parameter type-id='type-id-116'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='slide_hash_c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/deflate.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-12'/>
     </function-decl>
-    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='35' column='1'/>
+    <var-decl name='functable' type-id='type-id-104' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/functable.h' line='39' column='1'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-119'>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-41'/>
+      <return type-id='type-id-6'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-117'/>
       <return type-id='type-id-6'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
-      <parameter type-id='type-id-119'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-123'>
       <parameter type-id='type-id-94'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-6'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-123'>
+      <parameter type-id='type-id-6'/>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-125'>
-      <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-6'/>
+      <parameter type-id='type-id-6'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-126'>
+      <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-9'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-127'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-130'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-93'/>
+      <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-128'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-3'/>
-      <return type-id='type-id-42'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-131'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-12'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-132'>
-      <parameter type-id='type-id-119'/>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-12'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-133'>
-      <parameter type-id='type-id-93'/>
-      <return type-id='type-id-12'/>
-    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <type-decl name='variadic parameter type' id='type-id-134'/>
-    <typedef-decl name='gzFile' type-id='type-id-135' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-136'/>
-    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-137'>
+    <type-decl name='variadic parameter type' id='type-id-129'/>
+    <typedef-decl name='gzFile' type-id='type-id-130' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1285' column='1' id='type-id-131'/>
+    <class-decl name='gzFile_s' size-in-bits='192' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1790' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='have' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1791' column='1'/>
       </data-member>
@@ -1367,64 +1305,64 @@
         <var-decl name='pos' type-id='type-id-8' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1793' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-133'/>
     <function-decl name='zng_gzopen' mangled-name='zng_gzopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-43' name='path' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='215' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzdopen' mangled-name='zng_gzdopen' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdopen@@ZLIB_NG_GZ_2.0.0'>
       <parameter type-id='type-id-17' name='fd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
       <parameter type-id='type-id-43' name='mode' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='226' column='1'/>
-      <return type-id='type-id-136'/>
+      <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='zng_gzclose' mangled-name='zng_gzclose' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='245' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzbuffer' mangled-name='zng_gzbuffer' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzbuffer@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <parameter type-id='type-id-3' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='260' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzrewind' mangled-name='zng_gzrewind' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzrewind@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='284' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzseek' mangled-name='zng_gzseek' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzseek@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-8' name='offset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <parameter type-id='type-id-17' name='whence' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='304' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gztell' mangled-name='zng_gztell' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gztell@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='385' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gzoffset' mangled-name='zng_gzoffset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzoffset@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='411' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='zng_gzeof' mangled-name='zng_gzeof' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzeof@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='442' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzerror' mangled-name='zng_gzerror' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzerror@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
-      <parameter type-id='type-id-138' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
+      <parameter type-id='type-id-133' name='errnum' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='457' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_gzclearerr' mangled-name='zng_gzclearerr' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclearerr@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzlib.c' line='474' column='1'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='zng_gzclose_r' mangled-name='zng_gzclose_r' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_r@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_gzclose_w' mangled-name='zng_gzclose_w' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzclose_w@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136'/>
+      <parameter type-id='type-id-131'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='540' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1454,7 +1392,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-139'>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='gp_offset' type-id='type-id-3' visibility='default'/>
       </data-member>
@@ -1468,9 +1406,9 @@
         <var-decl name='reg_save_area' type-id='type-id-45' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
     <function-decl name='zng_gzwrite' mangled-name='zng_gzwrite' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzwrite@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='234' column='1'/>
       <return type-id='type-id-17'/>
@@ -1479,38 +1417,38 @@
       <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='258' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='zng_gzputc' mangled-name='zng_gzputc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='287' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzputs' mangled-name='zng_gzputs' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzputs@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <parameter type-id='type-id-43' name='s' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='332' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzvprintf' mangled-name='zng_gzvprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzvprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
-      <parameter type-id='type-id-140' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
+      <parameter type-id='type-id-135' name='va' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='356' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzprintf' mangled-name='zng_gzprintf' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzprintf@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter type-id='type-id-43' name='format' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='412' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzflush' mangled-name='zng_gzflush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzflush@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <parameter type-id='type-id-17' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='423' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zng_gzsetparams' mangled-name='zng_gzsetparams' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzsetparams@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='level' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <parameter type-id='type-id-17' name='strategy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzwrite.c' line='452' column='1'/>
       <return type-id='type-id-17'/>
@@ -1519,20 +1457,20 @@
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='61568' id='type-id-143'>
-      <subrange length='1924' type-id='type-id-4' id='type-id-144'/>
+    <array-type-def dimensions='1' type-id='type-id-137' size-in-bits='61568' id='type-id-138'>
+      <subrange length='1924' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-145'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='4608' id='type-id-140'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-147'>
-      <subrange length='320' type-id='type-id-4' id='type-id-148'/>
+    <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='5120' id='type-id-142'>
+      <subrange length='320' type-id='type-id-4' id='type-id-143'/>
     </array-type-def>
-    <enum-decl name='inflate_mode' naming-typedef-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-150'>
+    <enum-decl name='inflate_mode' naming-typedef-id='type-id-144' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='25' column='1' id='type-id-145'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='HEAD' value='16180'/>
       <enumerator name='FLAGS' value='16181'/>
@@ -1567,13 +1505,13 @@
       <enumerator name='MEM' value='16210'/>
       <enumerator name='SYNC' value='16211'/>
     </enum-decl>
-    <typedef-decl name='inflate_mode' type-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-149'/>
-    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-151'>
+    <typedef-decl name='inflate_mode' type-id='type-id-145' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='58' column='1' id='type-id-144'/>
+    <class-decl name='inflate_state' size-in-bits='73216' is-struct='yes' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='87' column='1' id='type-id-146'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='strm' type-id='type-id-15' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mode' type-id='type-id-149' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
+        <var-decl name='mode' type-id='type-id-144' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='last' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='90' column='1'/>
@@ -1633,10 +1571,10 @@
         <var-decl name='extra' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='lencode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
+        <var-decl name='lencode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='distcode' type-id='type-id-152' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
+        <var-decl name='distcode' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <var-decl name='lenbits' type-id='type-id-3' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='120' column='1'/>
@@ -1657,16 +1595,16 @@
         <var-decl name='have' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='next' type-id='type-id-153' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-148' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='lens' type-id='type-id-147' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
+        <var-decl name='lens' type-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='work' type-id='type-id-145' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
+        <var-decl name='work' type-id='type-id-140' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11456'>
-        <var-decl name='codes' type-id='type-id-143' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
+        <var-decl name='codes' type-id='type-id-138' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='73024'>
         <var-decl name='sane' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='131' column='1'/>
@@ -1681,7 +1619,7 @@
         <var-decl name='chunksize' type-id='type-id-6' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='134' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-142' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-154'>
+    <class-decl name='code' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='27' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='op' type-id='type-id-2' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='28' column='1'/>
       </data-member>
@@ -1692,208 +1630,204 @@
         <var-decl name='val' type-id='type-id-63' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='30' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='code' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-142'/>
-    <enum-decl name='codetype' naming-typedef-id='type-id-155' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-156'>
+    <typedef-decl name='code' type-id='type-id-149' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='31' column='1' id='type-id-137'/>
+    <enum-decl name='codetype' naming-typedef-id='type-id-150' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='57' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-67'/>
       <enumerator name='CODES' value='0'/>
       <enumerator name='LENS' value='1'/>
       <enumerator name='DISTS' value='2'/>
     </enum-decl>
-    <typedef-decl name='codetype' type-id='type-id-156' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-155'/>
-    <typedef-decl name='in_func' type-id='type-id-157' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-158'/>
-    <typedef-decl name='out_func' type-id='type-id-159' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-161'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-167'/>
-    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='35' column='1'/>
+    <typedef-decl name='codetype' type-id='type-id-151' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='61' column='1' id='type-id-150'/>
+    <typedef-decl name='in_func' type-id='type-id-152' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1075' column='1' id='type-id-153'/>
+    <typedef-decl name='out_func' type-id='type-id-154' filepath='/mnt/c/build/git/zlib-ng/btmp1/zlib-ng.h' line='1076' column='1' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-156'/>
+    <qualified-type-def type-id='type-id-137' const='yes' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-163'/>
+    <function-decl name='zng_inflateBackInit' mangled-name='zng_inflateBackInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='34' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='65' column='1'/>
+    <function-decl name='zng_inflateBackInit_' mangled-name='zng_inflateBackInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-42' name='window' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='63' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='64' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-158' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-160' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
-      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='143' column='1'/>
+    <function-decl name='zng_inflateBack' mangled-name='zng_inflateBack' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBack@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-153' name='in' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='in_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-155' name='out' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
+      <parameter type-id='type-id-45' name='out_desc' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='142' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='zng_inflateBackEnd' mangled-name='zng_inflateBackEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateBackEnd@@ZLIB_NG_2.0.0'>
       <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/infback.c' line='504' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate_fast' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inffast.h' line='13' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-4'/>
-      <return type-id='type-id-12'/>
-    </function-decl>
     <function-decl name='zng_fixedtables' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-159'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='zng_inflate_table' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inftrees.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-155'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-150'/>
+      <parameter type-id='type-id-162'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-167'/>
+      <parameter type-id='type-id-156'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-162'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-165'>
+    <function-type size-in-bits='64' id='type-id-160'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-34'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-166'>
+    <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-158'/>
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='63' column='1'/>
+    <function-decl name='zng_inflateResetKeep' mangled-name='zng_inflateResetKeep' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateResetKeep@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='62' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='90' column='1'/>
+    <function-decl name='zng_inflateReset' mangled-name='zng_inflateReset' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='89' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='102' column='1'/>
+    <function-decl name='zng_inflateReset2' mangled-name='zng_inflateReset2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateReset2@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='101' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='140' column='1'/>
+    <function-decl name='zng_inflateInit2' mangled-name='zng_inflateInit2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='139' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='173' column='1'/>
+    <function-decl name='zng_inflateInit' mangled-name='zng_inflateInit' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit@@ZLIB_NG_2.1.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='172' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='179' column='1'/>
+    <function-decl name='zng_inflateInit_' mangled-name='zng_inflateInit_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='178' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
-      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='186' column='1'/>
+    <function-decl name='zng_inflateInit2_' mangled-name='zng_inflateInit2_' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateInit2_@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='windowBits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-43' name='version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
+      <parameter type-id='type-id-34' name='stream_size' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='185' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
-      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='192' column='1'/>
+    <function-decl name='zng_inflatePrime' mangled-name='zng_inflatePrime' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflatePrime@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='bits' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
+      <parameter type-id='type-id-34' name='value' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='191' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
-      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='415' column='1'/>
+    <function-decl name='zng_inflate' mangled-name='zng_inflate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-34' name='flush' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='414' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1139' column='1'/>
+    <function-decl name='zng_inflateEnd' mangled-name='zng_inflateEnd' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateEnd@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1138' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
-      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1152' column='1'/>
+    <function-decl name='zng_inflateGetDictionary' mangled-name='zng_inflateGetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-42' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
+      <parameter type-id='type-id-98' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1151' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
-      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1172' column='1'/>
+    <function-decl name='zng_inflateSetDictionary' mangled-name='zng_inflateSetDictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSetDictionary@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-41' name='dictionary' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
+      <parameter type-id='type-id-6' name='dictLength' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1171' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
-      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1205' column='1'/>
+    <function-decl name='zng_inflateGetHeader' mangled-name='zng_inflateGetHeader' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateGetHeader@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
+      <parameter type-id='type-id-18' name='head' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1204' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1250' column='1'/>
+    <function-decl name='zng_inflateSync' mangled-name='zng_inflateSync' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSync@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1249' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1311' column='1'/>
+    <function-decl name='zng_inflateSyncPoint' mangled-name='zng_inflateSyncPoint' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateSyncPoint@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1310' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
-      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1321' column='1'/>
+    <function-decl name='zng_inflateCopy' mangled-name='zng_inflateCopy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCopy@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='dest' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-15' name='source' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1320' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
-      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1363' column='1'/>
+    <function-decl name='zng_inflateUndermine' mangled-name='zng_inflateUndermine' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateUndermine@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
+      <parameter type-id='type-id-34' name='subvert' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1362' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
-      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1379' column='1'/>
+    <function-decl name='zng_inflateValidate' mangled-name='zng_inflateValidate' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateValidate@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
+      <parameter type-id='type-id-34' name='check' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-34'/>
     </function-decl>
-    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1392' column='1'/>
+    <function-decl name='zng_inflateMark' mangled-name='zng_inflateMark' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateMark@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1391' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
-      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1404' column='1'/>
+    <function-decl name='zng_inflateCodesUsed' mangled-name='zng_inflateCodesUsed' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_inflateCodesUsed@@ZLIB_NG_2.0.0'>
+      <parameter type-id='type-id-15' name='strm' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/inflate.c' line='1403' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='9216' id='type-id-169'>
-      <subrange length='288' type-id='type-id-4' id='type-id-146'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='9216' id='type-id-165'>
+      <subrange length='288' type-id='type-id-4' id='type-id-141'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-170'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-164' size-in-bits='960' id='type-id-166'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='928' id='type-id-173'>
-      <subrange length='29' type-id='type-id-4' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='928' id='type-id-169'>
+      <subrange length='29' type-id='type-id-4' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='960' id='type-id-175'>
-      <subrange length='30' type-id='type-id-4' id='type-id-171'/>
+    <array-type-def dimensions='1' type-id='type-id-168' size-in-bits='960' id='type-id-171'>
+      <subrange length='30' type-id='type-id-4' id='type-id-167'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-176'>
-      <subrange length='256' type-id='type-id-4' id='type-id-177'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-172'>
+      <subrange length='256' type-id='type-id-4' id='type-id-173'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-178'>
-      <subrange length='512' type-id='type-id-4' id='type-id-179'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='4096' id='type-id-174'>
+      <subrange length='512' type-id='type-id-4' id='type-id-175'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-168'/>
-    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-172'/>
-    <var-decl name='static_ltree' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
-    <var-decl name='static_dtree' type-id='type-id-170' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
-    <var-decl name='zng_dist_code' type-id='type-id-178' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
-    <var-decl name='zng_length_code' type-id='type-id-176' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
-    <var-decl name='base_length' type-id='type-id-173' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
-    <var-decl name='base_dist' type-id='type-id-175' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-164'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-168'/>
+    <var-decl name='static_ltree' type-id='type-id-165' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='14' column='1'/>
+    <var-decl name='static_dtree' type-id='type-id-166' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='15' column='1'/>
+    <var-decl name='zng_dist_code' type-id='type-id-174' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='17' column='1'/>
+    <var-decl name='zng_length_code' type-id='type-id-172' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='18' column='1'/>
+    <var-decl name='base_length' type-id='type-id-169' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='20' column='1'/>
+    <var-decl name='base_dist' type-id='type-id-171' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/trees_emit.h' line='21' column='1'/>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
     <function-decl name='zng_uncompress2' mangled-name='zng_uncompress2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/uncompr.c' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_uncompress2@@ZLIB_NG_2.0.0'>
@@ -1912,16 +1846,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='640' id='type-id-181'>
-      <subrange length='10' type-id='type-id-4' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='640' id='type-id-177'>
+      <subrange length='10' type-id='type-id-4' id='type-id-178'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-183'>
-      <subrange length='38' type-id='type-id-4' id='type-id-184'/>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='304' id='type-id-179'>
+      <subrange length='38' type-id='type-id-4' id='type-id-180'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-185'/>
-    <var-decl name='zlibng_string' type-id='type-id-183' mangled-name='zlibng_string' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='28' column='1' elf-symbol-id='zlibng_string'/>
-    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version'>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-181'/>
+    <var-decl name='zng_vstring' type-id='type-id-179' mangled-name='zng_vstring' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='23' column='1' elf-symbol-id='zng_vstring@@ZLIB_NG_2.0.0'/>
+    <function-decl name='zlibng_version' mangled-name='zlibng_version' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibng_version@@ZLIB_NG_2.1.0'>
       <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='zng_zlibCompileFlags' mangled-name='zng_zlibCompileFlags' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_zlibCompileFlags@@ZLIB_NG_2.0.0'>
@@ -1931,41 +1865,63 @@
       <parameter type-id='type-id-17' name='err' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.c' line='99' column='1'/>
       <return type-id='type-id-43'/>
     </function-decl>
-    <var-decl name='zng_z_errmsg' type-id='type-id-181' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
+    <var-decl name='zng_z_errmsg' type-id='type-id-177' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/zutil.h' line='24' column='1'/>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/include/stdlib.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-181'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-17'/>
     </function-decl>
   </abi-instr>
+  <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_avx.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
+    <function-decl name='chunkmemset_sse41' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/chunkset_tpl.h' line='9' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-3'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
+    <function-decl name='chunkcopy_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-42'/>
+    </function-decl>
+    <function-decl name='chunkunroll_sse2' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/chunkset_sse41.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-163'/>
+      <return type-id='type-id-42'/>
+    </function-decl>
+  </abi-instr>
   <abi-instr address-size='64' path='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1/arch/x86' language='LANG_C11'>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-186'/>
-    <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='128' id='type-id-187'>
-      <subrange length='2' id='type-id-188'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-182' size-in-bits='128' id='type-id-183'>
+      <subrange length='2' id='type-id-184'/>
     </array-type-def>
-    <typedef-decl name='__m128i' type-id='type-id-187' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/emmintrin.h' line='53' column='1' id='type-id-189'/>
-    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-190'/>
+    <typedef-decl name='__m128i' type-id='type-id-183' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/emmintrin.h' line='53' column='1' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-186'/>
     <function-decl name='fold_16_vpclmulqdq' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-185'/>
       <parameter type-id='type-id-34'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='fold_16_vpclmulqdq_copy' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/arch/x86/crc32_fold_pclmulqdq.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-186'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-9'/>
@@ -1973,9 +1929,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-191' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-192'>
+    <class-decl name='gz_state' size-in-bits='1856' is-struct='yes' naming-typedef-id='type-id-187' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='102' column='1' id='type-id-188'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x' type-id='type-id-137' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
+        <var-decl name='x' type-id='type-id-132' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='mode' type-id='type-id-17' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='109' column='1'/>
@@ -2038,50 +1994,50 @@
         <var-decl name='strm' type-id='type-id-46' visibility='default' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gz_state' type-id='type-id-192' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-191'/>
-    <typedef-decl name='ssize_t' type-id='type-id-193' filepath='/usr/include/stdio.h' line='77' column='1' id='type-id-141'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='194' column='1' id='type-id-193'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-194'/>
-    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='347' column='1'/>
+    <typedef-decl name='gz_state' type-id='type-id-188' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='134' column='1' id='type-id-187'/>
+    <typedef-decl name='ssize_t' type-id='type-id-189' filepath='/usr/include/stdio.h' line='77' column='1' id='type-id-136'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='194' column='1' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-190'/>
+    <function-decl name='zng_gzread' mangled-name='zng_gzread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='345' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='379' column='1'/>
+    <function-decl name='zng_gzfread' mangled-name='zng_gzfread' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzfread@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-45' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-9' name='size' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-9' name='nitems' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='377' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='411' column='1'/>
+    <function-decl name='zng_gzgetc' mangled-name='zng_gzgetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='409' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='442' column='1'/>
+    <function-decl name='zng_gzungetc' mangled-name='zng_gzungetc' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzungetc@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-17' name='c' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='440' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
-      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='498' column='1'/>
+    <function-decl name='zng_gzgets' mangled-name='zng_gzgets' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzgets@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-32' name='buf' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
+      <parameter type-id='type-id-17' name='len' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='496' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
-      <parameter type-id='type-id-136' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='559' column='1'/>
+    <function-decl name='zng_gzdirect' mangled-name='zng_gzdirect' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zng_gzdirect@@ZLIB_NG_GZ_2.0.0'>
+      <parameter type-id='type-id-131' name='file' filepath='/mnt/c/build/git/zlib-ng/btmp1/gzread.c' line='557' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gz_error' filepath='/mnt/c/build/git/zlib-ng/btmp1/src.d/gzguts.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-190'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/include/errno.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-138'/>
+      <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/include/string.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
@@ -2102,7 +2058,7 @@
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-9'/>
-      <return type-id='type-id-141'/>
+      <return type-id='type-id-136'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/test/abicheck.sh b/test/abicheck.sh
index 96cb5072..1656711f 100755
--- a/test/abicheck.sh
+++ b/test/abicheck.sh
@@ -73,7 +73,7 @@ then
 else
   # Reference is most recent zlib-ng develop with zlib 1.2.12 compatible api.
   ABI_GIT_REPO=https://github.com/zlib-ng/zlib-ng.git
-  ABI_GIT_COMMIT=1ab443812aceab6c80ccd573ecdd06f73a84eef4
+  ABI_GIT_COMMIT=e4614ebcb9b3e5b108dc983c155e4baf80882311
 fi
 
 # Test compat build for ABI compatibility with zlib